diff options
author | Neal Norwitz <nnorwitz@gmail.com> | 2006-06-18 20:10:24 (GMT) |
---|---|---|
committer | Neal Norwitz <nnorwitz@gmail.com> | 2006-06-18 20:10:24 (GMT) |
commit | 0f51cf6e0473919d83da7ce3a7d23cd7d1ea0594 (patch) | |
tree | 867065f44f023c9f1c26bcdafeec7107e8afffc7 /Lib/test/test_fork1.py | |
parent | 10b835c40155bf3ff79839377a869742970e064f (diff) | |
download | cpython-0f51cf6e0473919d83da7ce3a7d23cd7d1ea0594.zip cpython-0f51cf6e0473919d83da7ce3a7d23cd7d1ea0594.tar.gz cpython-0f51cf6e0473919d83da7ce3a7d23cd7d1ea0594.tar.bz2 |
Revert 47014 until it is more robust
Diffstat (limited to 'Lib/test/test_fork1.py')
-rw-r--r-- | Lib/test/test_fork1.py | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/Lib/test/test_fork1.py b/Lib/test/test_fork1.py index 7f445ab..cba5fc7 100644 --- 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)) |