Changeset 391 for python/trunk/Lib/test/test_startfile.py

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Lib/test/test_startfile.py (modified) (3 diffs)

python/trunk/Lib/test/test_startfile.py

@@ -10 +10 @@
 import unittest
 from test import test_support
+import os
+from os import path
+from time import sleep
 
-# use this form so that the test is skipped when startfile is not available:
-from os import startfile, path
+startfile = test_support.get_attribute(os, 'startfile')
+
 
 class TestCase(unittest.TestCase):
@@ -25 +28 @@
         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)
 
     def test_empty_u(self):
@@ -30 +37 @@
         startfile(unicode(empty, "mbcs"))
         startfile(unicode(empty, "mbcs"), "open")
+        sleep(0.1)
 
 def test_main():