summaryrefslogtreecommitdiffstats
path: root/Lib/test/fork_wait.py
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2006-06-18 20:10:24 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2006-06-18 20:10:24 (GMT)
commit0f51cf6e0473919d83da7ce3a7d23cd7d1ea0594 (patch)
tree867065f44f023c9f1c26bcdafeec7107e8afffc7 /Lib/test/fork_wait.py
parent10b835c40155bf3ff79839377a869742970e064f (diff)
downloadcpython-0f51cf6e0473919d83da7ce3a7d23cd7d1ea0594.zip
cpython-0f51cf6e0473919d83da7ce3a7d23cd7d1ea0594.tar.gz
cpython-0f51cf6e0473919d83da7ce3a7d23cd7d1ea0594.tar.bz2
Revert 47014 until it is more robust
Diffstat (limited to 'Lib/test/fork_wait.py')
-rw-r--r--Lib/test/fork_wait.py9
1 files changed, 1 insertions, 8 deletions
diff --git a/Lib/test/fork_wait.py b/Lib/test/fork_wait.py
index 7eb55f6..5600bdb 100644
--- 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))