summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorGregory P. Smith <greg@krypto.org>2012-09-29 18:53:08 (GMT)
committerGregory P. Smith <greg@krypto.org>2012-09-29 18:53:08 (GMT)
commit02dee1acd8d905a2348e5ed4d9f97cb490e5e255 (patch)
tree36841ec3c83b8a590a9908b783613c9c28c64d48 /Lib/test
parentcff1c6f66555ced39ab8c5cff61a0872015dee7a (diff)
parent3905171f1ea778c60c74dd4b0318b894eda94d7f (diff)
downloadcpython-02dee1acd8d905a2348e5ed4d9f97cb490e5e255.zip
cpython-02dee1acd8d905a2348e5ed4d9f97cb490e5e255.tar.gz
cpython-02dee1acd8d905a2348e5ed4d9f97cb490e5e255.tar.bz2
Fixes issue #15756: subprocess.poll() now properly handles errno.ECHILD
to return a returncode of 0 when the child has already exited or cannot be waited on.
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/subprocessdata/sigchild_ignore.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/Lib/test/subprocessdata/sigchild_ignore.py b/Lib/test/subprocessdata/sigchild_ignore.py
index 6072aec..86320fb 100644
--- a/Lib/test/subprocessdata/sigchild_ignore.py
+++ b/Lib/test/subprocessdata/sigchild_ignore.py
@@ -1,6 +1,15 @@
-import signal, subprocess, sys
+import signal, subprocess, sys, time
# On Linux this causes os.waitpid to fail with OSError as the OS has already
# reaped our child process. The wait() passing the OSError on to the caller
# and causing us to exit with an error is what we are testing against.
signal.signal(signal.SIGCHLD, signal.SIG_IGN)
subprocess.Popen([sys.executable, '-c', 'print("albatross")']).wait()
+# Also ensure poll() handles an errno.ECHILD appropriately.
+p = subprocess.Popen([sys.executable, '-c', 'print("albatross")'])
+num_polls = 0
+while p.poll() is None:
+ # Waiting for the process to finish.
+ time.sleep(0.01) # Avoid being a CPU busy loop.
+ num_polls += 1
+ if num_polls > 3000:
+ raise RuntimeError('poll should have returned 0 within 30 seconds')