From: Jeffrey Yasskin <jyasskin@gmail.com>
Date: Fri, 21 Mar 2008 05:51:37 +0000 (+0000)
Subject: Try to fix test_signal breakages on Linux due to r61687. It appears that at
X-Git-Tag: v2.6a2~195
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6cda88ea11e5434e8292ce28ce18679f929d01e4;p=thirdparty%2FPython%2Fcpython.git

Try to fix test_signal breakages on Linux due to r61687. It appears that at
least two of the linux build bots aren't leaving zombie processes around for
os.waitpid to wait for, causing ECHILD errors. This would be a symptom of a bug
somewhere, but probably not in signal itself.
---

diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
index 76574afa859b..b0195d72110d 100644
--- a/Lib/test/test_signal.py
+++ b/Lib/test/test_signal.py
@@ -44,9 +44,11 @@ class InterProcessSignalTests(unittest.TestCase):
         """Wait for child_pid to finish, ignoring EINTR."""
         while True:
             try:
-                pid, status = os.waitpid(child_pid, 0)
-                return status
+                os.waitpid(child_pid, 0)
+                return
             except OSError as e:
+                if e.errno == errno.ECHILD:
+                    return
                 if e.errno != errno.EINTR:
                     raise