Commit 10b835c4 authored by Neal Norwitz's avatar Neal Norwitz

The hppa ubuntu box sometimes hangs forever in these tests. My guess

is that the wait is failing for some reason.  Use WNOHANG, so we won't
wait until the buildbot kills the test suite.

I haven't been able to reproduce the failure, so I'm not sure if
this will help or not.  Hopefully, this change will cause the test
to fail, rather than hang.  That will be better since we will get
the rest of the test results.  It may also help us debug the real problem.
parent 9602cc2a
...@@ -34,7 +34,14 @@ class ForkWait(unittest.TestCase): ...@@ -34,7 +34,14 @@ class ForkWait(unittest.TestCase):
pass pass
def wait_impl(self, cpid): def wait_impl(self, cpid):
spid, status = os.waitpid(cpid, 0) 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)
self.assertEquals(spid, cpid) self.assertEquals(spid, cpid)
self.assertEquals(status, 0, "cause = %d, exit = %d" % (status&0xff, status>>8)) self.assertEquals(status, 0, "cause = %d, exit = %d" % (status&0xff, status>>8))
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
""" """
import os import os
import time
from test.fork_wait import ForkWait from test.fork_wait import ForkWait
from test.test_support import TestSkipped, run_unittest from test.test_support import TestSkipped, run_unittest
...@@ -12,7 +13,14 @@ except AttributeError: ...@@ -12,7 +13,14 @@ except AttributeError:
class ForkTest(ForkWait): class ForkTest(ForkWait):
def wait_impl(self, cpid): def wait_impl(self, cpid):
spid, status = os.waitpid(cpid, 0) 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)
self.assertEqual(spid, cpid) self.assertEqual(spid, cpid)
self.assertEqual(status, 0, "cause = %d, exit = %d" % (status&0xff, status>>8)) self.assertEqual(status, 0, "cause = %d, exit = %d" % (status&0xff, status>>8))
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
""" """
import os import os
import time
from test.fork_wait import ForkWait from test.fork_wait import ForkWait
from test.test_support import TestSkipped, run_unittest from test.test_support import TestSkipped, run_unittest
...@@ -17,10 +18,14 @@ except AttributeError: ...@@ -17,10 +18,14 @@ except AttributeError:
class Wait3Test(ForkWait): class Wait3Test(ForkWait):
def wait_impl(self, cpid): def wait_impl(self, cpid):
while 1: for i in range(10):
spid, status, rusage = os.wait3(0) # 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)
if spid == cpid: if spid == cpid:
break break
time.sleep(1.0)
self.assertEqual(spid, cpid) self.assertEqual(spid, cpid)
self.assertEqual(status, 0, "cause = %d, exit = %d" % (status&0xff, status>>8)) self.assertEqual(status, 0, "cause = %d, exit = %d" % (status&0xff, status>>8))
self.assertTrue(rusage) self.assertTrue(rusage)
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
""" """
import os import os
import time
from test.fork_wait import ForkWait from test.fork_wait import ForkWait
from test.test_support import TestSkipped, run_unittest from test.test_support import TestSkipped, run_unittest
...@@ -17,7 +18,13 @@ except AttributeError: ...@@ -17,7 +18,13 @@ except AttributeError:
class Wait4Test(ForkWait): class Wait4Test(ForkWait):
def wait_impl(self, cpid): def wait_impl(self, cpid):
spid, status, rusage = os.wait4(cpid, 0) 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)
self.assertEqual(spid, cpid) self.assertEqual(spid, cpid)
self.assertEqual(status, 0, "cause = %d, exit = %d" % (status&0xff, status>>8)) self.assertEqual(status, 0, "cause = %d, exit = %d" % (status&0xff, status>>8))
self.assertTrue(rusage) self.assertTrue(rusage)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment