changeset:   84439:8055521e372f
parent:      84437:c9545c2386c4
parent:      84438:b3ea1b5a1617
user:        Antoine Pitrou <solipsis@pitrou.net>
date:        Thu Jul 04 21:05:30 2013 +0200
files:       Misc/NEWS
description:
Issue #11185: Fix test_wait4 under AIX.  Patch by Sébastien Sablé.


diff -r c9545c2386c4 -r 8055521e372f Lib/test/test_wait4.py
--- a/Lib/test/test_wait4.py	Wed Jul 03 23:07:59 2013 +0200
+++ b/Lib/test/test_wait4.py	Thu Jul 04 21:05:30 2013 +0200
@@ -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 @@
 
 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 -r c9545c2386c4 -r 8055521e372f Misc/NEWS
--- a/Misc/NEWS	Wed Jul 03 23:07:59 2013 +0200
+++ b/Misc/NEWS	Thu Jul 04 21:05:30 2013 +0200
@@ -465,10 +465,11 @@
 
 - Implement PEP 435 "Adding an Enum type to the Python standard library".
 
-
 Tests
 -----
 
+- Issue #11185: Fix test_wait4 under AIX.  Patch by Sébastien Sablé.
+
 - Issue #18207: Fix test_ssl for some versions of OpenSSL that ignore seconds
   in ASN1_TIME fields.