mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Antoine Pitrou 2013-07-04 21:05:30 +02:00
parent 7e71c5672c be9c841494
commit 0cb1e9ab97
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Lib/test/test_wait4.py
View File

@ -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.support import run_unittest, reap_children, get_attribute from test.support import run_unittest, reap_children, get_attribute
@ -13,10 +14,15 @@
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)

3
Misc/NEWS
View File

@ -465,10 +465,11 @@ Library
- Implement PEP 435 "Adding an Enum type to the Python standard library". - Implement PEP 435 "Adding an Enum type to the Python standard library".
Tests 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 - Issue #18207: Fix test_ssl for some versions of OpenSSL that ignore seconds
in ASN1_TIME fields. in ASN1_TIME fields.