From: Nick Coghlan <ncoghlan@gmail.com>
Date: Mon, 29 Jul 2013 05:18:09 +0000 (+1000)
Subject: Attempt to fix #15415 on Windows
X-Git-Tag: v3.4.0a1~49^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2f253e8e626fa74e78cddfb1a79b8c1e7bbbab9c;p=thirdparty%2FPython%2Fcpython.git

Attempt to fix #15415 on Windows
---

diff --git a/Lib/test/test_startfile.py b/Lib/test/test_startfile.py
index 5a9c2def2425..68e35b3d3bed 100644
--- a/Lib/test/test_startfile.py
+++ b/Lib/test/test_startfile.py
@@ -21,12 +21,12 @@ class TestCase(unittest.TestCase):
         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)