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

diff --git a/Lib/test/test_wait4.py b/Lib/test/test_wait4.py
index d04a11bde108ecdaf42ffeb6b833dde93399b5b9..54580a90266931cb1171b512b9b9943498bc217f 100644 (file)
--- 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.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)

diff --git a/Misc/NEWS b/Misc/NEWS
index 405bf5c493e74e57bf2bee2c5346d63ff375a3f4..fec41b73424d91f0fe219f6fc0d6849b3957a598 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -99,6 +99,8 @@ IDLE
 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 #11995: test_pydoc doesn't import all sys.path modules anymore.