summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorGregory P. Smith <greg@krypto.org>2012-09-29 18:55:16 (GMT)
committerGregory P. Smith <greg@krypto.org>2012-09-29 18:55:16 (GMT)
commit288d9aec4b7df78cebf47dc8c12b7a93cc1a0faa (patch)
tree6875caa4aac01f9b8de98797dffd7ee50184fe87 /Lib/test
parent1ed3ffebb9654622dc1089808ff95fadb84eda25 (diff)
parent02dee1acd8d905a2348e5ed4d9f97cb490e5e255 (diff)
downloadcpython-288d9aec4b7df78cebf47dc8c12b7a93cc1a0faa.zip
cpython-288d9aec4b7df78cebf47dc8c12b7a93cc1a0faa.tar.gz
cpython-288d9aec4b7df78cebf47dc8c12b7a93cc1a0faa.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')