diff options
author | Antoine Pitrou <solipsis@pitrou.net> | 2013-07-04 19:05:30 (GMT) |
---|---|---|
committer | Antoine Pitrou <solipsis@pitrou.net> | 2013-07-04 19:05:30 (GMT) |
commit | 0cb1e9ab97ddbe68fc40084aafb382071524e1da (patch) | |
tree | a9e087c11169dc93003ce164a1e0a5af66a0a52a /Lib | |
parent | 7e71c5672cdd42d58ec4eb09fe6ca91616239f65 (diff) | |
parent | be9c8414945dc15c079d07a0b84597142ea41511 (diff) | |
download | cpython-0cb1e9ab97ddbe68fc40084aafb382071524e1da.zip cpython-0cb1e9ab97ddbe68fc40084aafb382071524e1da.tar.gz cpython-0cb1e9ab97ddbe68fc40084aafb382071524e1da.tar.bz2 |
Issue #11185: Fix test_wait4 under AIX. Patch by Sébastien Sablé.
Diffstat (limited to 'Lib')
-rw-r--r-- | Lib/test/test_wait4.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Lib/test/test_wait4.py b/Lib/test/test_wait4.py index cdcd060..352c11a 100644 --- a/Lib/test/test_wait4.py +++ b/Lib/test/test_wait4.py @@ -3,6 +3,7 @@ import os import time +import sys from test.fork_wait import ForkWait from test.support import run_unittest, reap_children, get_attribute @@ -13,10 +14,15 @@ get_attribute(os, 'wait4') class Wait4Test(ForkWait): 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): # 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) + spid, status, rusage = os.wait4(cpid, option) if spid == cpid: break time.sleep(1.0) |