From: Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Date: Sun, 5 Dec 2010 02:41:46 +0000 (+0000)
Subject: Avoid possible zombi process.
X-Git-Tag: v3.2b1~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8e9fe9f48941c2a0bcadae6c044b1cfc89229484;p=thirdparty%2FPython%2Fcpython.git

Avoid possible zombi process.
---

diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index fc6084b05e3d..9cfd7b8ffb9d 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -1106,13 +1106,15 @@ class Win32KillTests(unittest.TestCase):
                                 "win_console_handler.py"), tagname],
                    creationflags=subprocess.CREATE_NEW_PROCESS_GROUP)
         # Let the interpreter startup before we send signals. See #3137.
-        count, max = 0, 20
+        count, max = 0, 100
         while count < max and proc.poll() is None:
             if m[0] == 1:
                 break
-            time.sleep(0.5)
+            time.sleep(0.1)
             count += 1
         else:
+            # Forcefully kill the process if we weren't able to signal it.
+            os.kill(proc.pid, signal.SIGINT)
             self.fail("Subprocess didn't finish initialization")
         os.kill(proc.pid, event)
         # proc.send_signal(event) could also be done here.