[Python-checkins] r47015 - python/trunk/Lib/test/fork_wait.py python/trunk/Lib/test/test_fork1.py python/trunk/Lib/test/test_wait3.py python/trunk/Lib/test/test_wait4.py
neal.norwitz
python-checkins at python.org
Sun Jun 18 22:10:25 CEST 2006
Author: neal.norwitz
Date: Sun Jun 18 22:10:24 2006
New Revision: 47015
Modified:
python/trunk/Lib/test/fork_wait.py
python/trunk/Lib/test/test_fork1.py
python/trunk/Lib/test/test_wait3.py
python/trunk/Lib/test/test_wait4.py
Log:
Revert 47014 until it is more robust
Modified: python/trunk/Lib/test/fork_wait.py
==============================================================================
--- python/trunk/Lib/test/fork_wait.py (original)
+++ python/trunk/Lib/test/fork_wait.py Sun Jun 18 22:10:24 2006
@@ -34,14 +34,7 @@
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))
Modified: python/trunk/Lib/test/test_fork1.py
==============================================================================
--- python/trunk/Lib/test/test_fork1.py (original)
+++ python/trunk/Lib/test/test_fork1.py Sun Jun 18 22:10:24 2006
@@ -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 @@
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))
Modified: python/trunk/Lib/test/test_wait3.py
==============================================================================
--- python/trunk/Lib/test/test_wait3.py (original)
+++ python/trunk/Lib/test/test_wait3.py Sun Jun 18 22:10:24 2006
@@ -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 @@
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)
Modified: python/trunk/Lib/test/test_wait4.py
==============================================================================
--- python/trunk/Lib/test/test_wait4.py (original)
+++ python/trunk/Lib/test/test_wait4.py Sun Jun 18 22:10:24 2006
@@ -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 @@
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)
More information about the Python-checkins
mailing list