diff options
| author | Nick Coghlan <ncoghlan@gmail.com> | 2013-07-29 07:51:16 (GMT) |
|---|---|---|
| committer | Nick Coghlan <ncoghlan@gmail.com> | 2013-07-29 07:51:16 (GMT) |
| commit | c06c0aed58db0f223e91607485de8a9fe77c3e7e (patch) | |
| tree | 6a7c3d4fc34e0d8c1dba2fddc0d4d0c3624df160 /Lib/test | |
| parent | 2f253e8e626fa74e78cddfb1a79b8c1e7bbbab9c (diff) | |
| download | cpython-c06c0aed58db0f223e91607485de8a9fe77c3e7e.zip cpython-c06c0aed58db0f223e91607485de8a9fe77c3e7e.tar.gz cpython-c06c0aed58db0f223e91607485de8a9fe77c3e7e.tar.bz2 | |
Third attempt to fix #15415 on Windows
With help from jkloth on IRC, so it will hopefully work
this time :)
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/test_startfile.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Lib/test/test_startfile.py b/Lib/test/test_startfile.py index 68e35b3..43abf9b 100644 --- a/Lib/test/test_startfile.py +++ b/Lib/test/test_startfile.py @@ -21,12 +21,14 @@ class TestCase(unittest.TestCase): self.assertRaises(OSError, startfile, "nonexisting.vbs") def test_empty(self): - # startfile is a little odd when it comes to handling absolute - # paths, so we briefly switch to the main test directory - # and use a relative path - with support.change_cwd(support.TEST_HOME): - empty = "empty.vbs" + # We need to make sure the child process starts in a directory + # we're not about to delete. If we're running under -j, that + # means the test harness provided directory isn't a safe option. + # See http://bugs.python.org/issue15526 for more details + with support.change_cwd(path.dirname(sys.executable)): + empty = path.join(path.dirname(__file__), "empty.vbs") startfile(empty) + startfile(empty, "open") def test_main(): support.run_unittest(TestCase) |