Commits

Anonymous committed f4b4412

Revert 47014 until it is more robust

Comments (0)

Files changed (4)

Lib/test/fork_wait.py

                 pass
 
     def wait_impl(self, cpid):
-        for i in range(10):
-            # waitpid() shouldn't hang, but some of the buildbots seem to hang
-            # in the forking tests.  This is an attempt to fix the problem.
-            spid, status = os.waitpid(cpid, os.WNOHANG)
-            if spid == cpid:
-                break
-            time.sleep(2 * SHORTSLEEP)
-
+        spid, status = os.waitpid(cpid, 0)
         self.assertEquals(spid, cpid)
         self.assertEquals(status, 0, "cause = %d, exit = %d" % (status&0xff, status>>8))
 

Lib/test/test_fork1.py

 """
 
 import os
-import time
 from test.fork_wait import ForkWait
 from test.test_support import TestSkipped, run_unittest
 
 
 class ForkTest(ForkWait):
     def wait_impl(self, cpid):
-        for i in range(10):
-            # waitpid() shouldn't hang, but some of the buildbots seem to hang
-            # in the forking tests.  This is an attempt to fix the problem.
-            spid, status = os.waitpid(cpid, os.WNOHANG)
-            if spid == cpid:
-                break
-            time.sleep(1.0)
-
+        spid, status = os.waitpid(cpid, 0)
         self.assertEqual(spid, cpid)
         self.assertEqual(status, 0, "cause = %d, exit = %d" % (status&0xff, status>>8))
 

Lib/test/test_wait3.py

 """
 
 import os
-import time
 from test.fork_wait import ForkWait
 from test.test_support import TestSkipped, run_unittest
 
 
 class Wait3Test(ForkWait):
     def wait_impl(self, cpid):
-        for i in range(10):
-            # wait3() shouldn't hang, but some of the buildbots seem to hang
-            # in the forking tests.  This is an attempt to fix the problem.
-            spid, status, rusage = os.wait3(os.WNOHANG)
+        while 1:
+            spid, status, rusage = os.wait3(0)
             if spid == cpid:
                 break
-            time.sleep(1.0)
-
         self.assertEqual(spid, cpid)
         self.assertEqual(status, 0, "cause = %d, exit = %d" % (status&0xff, status>>8))
         self.assertTrue(rusage)

Lib/test/test_wait4.py

 """
 
 import os
-import time
 from test.fork_wait import ForkWait
 from test.test_support import TestSkipped, run_unittest
 
 
 class Wait4Test(ForkWait):
     def wait_impl(self, cpid):
-        for i in range(10):
-            # wait4() shouldn't hang, but some of the buildbots seem to hang
-            # in the forking tests.  This is an attempt to fix the problem.
-            spid, status, rusage = os.wait4(cpid, os.WNOHANG)
-            if spid == cpid:
-                break
-            time.sleep(1.0)
+        spid, status, rusage = os.wait4(cpid, 0)
         self.assertEqual(spid, cpid)
         self.assertEqual(status, 0, "cause = %d, exit = %d" % (status&0xff, status>>8))
         self.assertTrue(rusage)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.