[Python-checkins] cpython (3.3): Attempt to fix #15415 on Windows

nick.coghlan python-checkins at python.org
Mon Jul 29 07:19:43 CEST 2013


http://hg.python.org/cpython/rev/a76693942de3
changeset:   84894:a76693942de3
branch:      3.3
parent:      84891:70a4287a25b4
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Mon Jul 29 15:18:09 2013 +1000
summary:
  Attempt to fix #15415 on Windows

files:
  Lib/test/test_startfile.py |  10 +++++-----
  1 files changed, 5 insertions(+), 5 deletions(-)


diff --git a/Lib/test/test_startfile.py b/Lib/test/test_startfile.py
--- a/Lib/test/test_startfile.py
+++ b/Lib/test/test_startfile.py
@@ -21,12 +21,12 @@
         self.assertRaises(OSError, startfile, "nonexisting.vbs")
 
     def test_empty(self):
-        # Switch to an existing, but safe, working directory to let the
-        # cleanup code do its thing without permission errors.
-        with support.temp_cwd(path=path.dirname(sys.executable)):
-            empty = path.join(path.dirname(__file__), "empty.vbs")
+        # 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"
             startfile(empty)
-            startfile(empty, "open")
 
 def test_main():
     support.run_unittest(TestCase)

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list