From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 15 Sep 2012 22:12:50 +0000 (+0200)
Subject: Issue #15526: try to fix test_startfile's inability to clean up after itself in time.
X-Git-Tag: v3.3.1rc1~813^2~71
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8a53dbeb7a9d0ae3e446f36e56cf9acfabe443c1;p=python

Issue #15526: try to fix test_startfile's inability to clean up after itself in time.
Patch by Jeremy Kloth.
---

diff --git a/Lib/test/test_startfile.py b/Lib/test/test_startfile.py
index dd505bf8ce..ae9aeb9b6c 100644
--- a/Lib/test/test_startfile.py
+++ b/Lib/test/test_startfile.py
@@ -10,8 +10,8 @@
 import unittest
 from test import support
 import os
+import sys
 from os import path
-from time import sleep
 
 startfile = support.get_attribute(os, 'startfile')
 
@@ -21,13 +21,12 @@ class TestCase(unittest.TestCase):
         self.assertRaises(OSError, startfile, "nonexisting.vbs")
 
     def test_empty(self):
-        empty = path.join(path.dirname(__file__), "empty.vbs")
-        startfile(empty)
-        startfile(empty, "open")
-        # Give the child process some time to exit before we finish.
-        # Otherwise the cleanup code will not be able to delete the cwd,
-        # because it is still in use.
-        sleep(0.1)
+        # 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(empty)
+            startfile(empty, "open")
 
 def test_main():
     support.run_unittest(TestCase)