Revert 47014 until it is more robust

diff --git a/Lib/test/fork_wait.py b/Lib/test/fork_wait.py
index 7eb55f66831d150b8289c0af50dc418688b272f4..5600bdbc512798170e5856be8bdc005a2b820cf0 100644 (file)
--- a/Lib/test/fork_wait.py
+++ b/Lib/test/fork_wait.py
@@ -34,14 +34,7 @@ class ForkWait(unittest.TestCase):
                 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))
 

diff --git a/Lib/test/test_fork1.py b/Lib/test/test_fork1.py
index 7f445ab55525561511f0080f52d3b2f42e6b45e9..cba5fc7d19e76cc8dcd0a0e89094408a01c107ee 100644 (file)
--- a/Lib/test/test_fork1.py
+++ b/Lib/test/test_fork1.py
@@ -2,7 +2,6 @@
 """
 
 import os
-import time
 from test.fork_wait import ForkWait
 from test.test_support import TestSkipped, run_unittest
 
@@ -13,14 +12,7 @@ except AttributeError:
 
 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))
 

diff --git a/Lib/test/test_wait3.py b/Lib/test/test_wait3.py
index 532cb49d615e0f28d7a9f615e5be6d52a6919800..f6a41a698cb0d5a90cc241b046a4e7890554eba2 100644 (file)
--- a/Lib/test/test_wait3.py
+++ b/Lib/test/test_wait3.py
@@ -2,7 +2,6 @@
 """
 
 import os
-import time
 from test.fork_wait import ForkWait
 from test.test_support import TestSkipped, run_unittest
 
@@ -18,14 +17,10 @@ except AttributeError:
 
 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)

diff --git a/Lib/test/test_wait4.py b/Lib/test/test_wait4.py
index fee593e1e86aa55687fb5bdc7a34173d47ffba6b..027e5c35249c89ceceb52d48aa70f76843cb3a35 100644 (file)
--- a/Lib/test/test_wait4.py
+++ b/Lib/test/test_wait4.py
@@ -2,7 +2,6 @@
 """
 
 import os
-import time
 from test.fork_wait import ForkWait
 from test.test_support import TestSkipped, run_unittest
 
@@ -18,13 +17,7 @@ except AttributeError:
 
 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)