Commit 0c503c2c authored by Antoine Pitrou's avatar Antoine Pitrou

Issue #11185: Fix test_wait4 under AIX. Patch by Sébastien Sablé.

parent e38905b4
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
import os import os
import time import time
import sys
from test.fork_wait import ForkWait from test.fork_wait import ForkWait
from test.test_support import run_unittest, reap_children, get_attribute from test.test_support import run_unittest, reap_children, get_attribute
...@@ -13,10 +14,15 @@ get_attribute(os, 'wait4') ...@@ -13,10 +14,15 @@ get_attribute(os, 'wait4')
class Wait4Test(ForkWait): class Wait4Test(ForkWait):
def wait_impl(self, cpid): def wait_impl(self, cpid):
option = os.WNOHANG
if sys.platform.startswith('aix'):
# Issue #11185: wait4 is broken on AIX and will always return 0
# with WNOHANG.
option = 0
for i in range(10): for i in range(10):
# wait4() shouldn't hang, but some of the buildbots seem to hang # wait4() shouldn't hang, but some of the buildbots seem to hang
# in the forking tests. This is an attempt to fix the problem. # in the forking tests. This is an attempt to fix the problem.
spid, status, rusage = os.wait4(cpid, os.WNOHANG) spid, status, rusage = os.wait4(cpid, option)
if spid == cpid: if spid == cpid:
break break
time.sleep(1.0) time.sleep(1.0)
......
...@@ -99,6 +99,8 @@ IDLE ...@@ -99,6 +99,8 @@ IDLE
Tests Tests
----- -----
- Issue #11185: Fix test_wait4 under AIX. Patch by Sébastien Sablé.
- Issue #18094: test_uuid no more reports skipped tests as passed. - Issue #18094: test_uuid no more reports skipped tests as passed.
- Issue #11995: test_pydoc doesn't import all sys.path modules anymore. - Issue #11995: test_pydoc doesn't import all sys.path modules anymore.
......
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