From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Fri, 5 Mar 2010 00:47:40 +0000 (+0000)
Subject: Workaround #3137: Retry SIGINT if it is not received the first time.
X-Git-Tag: v2.7a4~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=80e0e2d2d8e648f89e216a6fbcd9b96122a3fa69;p=python

Workaround #3137: Retry SIGINT if it is not received the first time.
test_send_signal should not hang anymore on various Linux distributions.
---

diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 1f3b09c538..ea4f5ab9f2 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -654,9 +654,20 @@ class POSIXProcessTestCase(unittest.TestCase):
         p = subprocess.Popen([sys.executable, "-c", "input()"])
 
         # Let the process initialize correctly (Issue #3137)
-        time.sleep(.1)
+        time.sleep(0.1)
         self.assertIs(p.poll(), None)
-        p.send_signal(signal.SIGINT)
+        count, maxcount = 0, 3
+        # Retry if the process do not receive the SIGINT signal.
+        while count < maxcount and p.poll() is None:
+            p.send_signal(signal.SIGINT)
+            time.sleep(0.1)
+            count += 1
+        if p.poll() is None:
+            raise test_support.TestFailed("the subprocess did not receive "
+                                          "the signal SIGINT")
+        elif count > 1:
+            print >>sys.stderr, ("p.send_signal(SIGINT) succeeded "
+                                 "after {} attempts".format(count))
         self.assertNotEqual(p.wait(), 0)
 
     def test_kill(self):