[Python-checkins] cpython (3.3): Issue #11185: Fix test_wait4 under AIX. Patch by Sébastien Sablé.

[antoine.pitrou]

http://hg.python.org/cpython/rev/b3ea1b5a1617
changeset:   84438:b3ea1b5a1617
branch:      3.3
parent:      84436:13e154067de3
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Thu Jul 04 21:03:10 2013 +0200
summary:
  Issue #11185: Fix test_wait4 under AIX.  Patch by Sébastien Sablé.

files:
  Lib/test/test_wait4.py |  8 +++++++-
  Misc/NEWS              |  2 ++
  2 files changed, 9 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_wait4.py b/Lib/test/test_wait4.py
--- 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 @@
 
 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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -155,6 +155,8 @@
 Tests
 -----
 
+- Issue #11185: Fix test_wait4 under AIX.  Patch by Sébastien Sablé.
+
 - Issue #17691: test_univnewlines now works with unittest test discovery.
   Patch by Zachary Ware.
 

-- 
Repository URL: http://hg.python.org/cpython