From: Victor Stinner <victor.stinner@gmail.com>
Date: Tue, 15 Sep 2015 10:15:59 +0000 (+0200)
Subject: Issue #25122: try to debug test_eintr hang on FreeBSD
X-Git-Tag: v3.6.0a1~1547
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f11d0d2c0d44c812534067c76e61c366b5b79a06;p=python

Issue #25122: try to debug test_eintr hang on FreeBSD

* Add verbose mode to test_eintr
* Always enable verbose mode in test_eintr
* Use faulthandler.dump_traceback_later() with a timeout of 15 minutes in
  eintr_tester.py
---

diff --git a/Lib/test/eintrdata/eintr_tester.py b/Lib/test/eintrdata/eintr_tester.py
index 0616df66c7..b96f09b691 100644
--- a/Lib/test/eintrdata/eintr_tester.py
+++ b/Lib/test/eintrdata/eintr_tester.py
@@ -8,6 +8,7 @@ Signals are generated in-process using setitimer(ITIMER_REAL), which allows
 sub-second periodicity (contrarily to signal()).
 """
 
+import faulthandler
 import io
 import os
 import select
@@ -36,12 +37,19 @@ class EINTRBaseTest(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         cls.orig_handler = signal.signal(signal.SIGALRM, lambda *args: None)
+        if hasattr(faulthandler, 'dump_traceback_later'):
+            # Most tests take less than 30 seconds, so 15 minutes should be
+            # enough. dump_traceback_later() is implemented with a thread, but
+            # pthread_sigmask() is used to mask all signaled on this thread.
+            faulthandler.dump_traceback_later(5 * 60, exit=True)
         signal.setitimer(signal.ITIMER_REAL, cls.signal_delay,
                          cls.signal_period)
 
     @classmethod
     def stop_alarm(cls):
         signal.setitimer(signal.ITIMER_REAL, 0, 0)
+        if hasattr(faulthandler, 'cancel_dump_traceback_later'):
+            faulthandler.cancel_dump_traceback_later()
 
     @classmethod
     def tearDownClass(cls):
diff --git a/Lib/test/test_eintr.py b/Lib/test/test_eintr.py
index 111ead365c..1d1d16e0eb 100644
--- a/Lib/test/test_eintr.py
+++ b/Lib/test/test_eintr.py
@@ -1,5 +1,7 @@
 import os
 import signal
+import subprocess
+import sys
 import unittest
 
 from test import support
@@ -14,7 +16,15 @@ class EINTRTests(unittest.TestCase):
         # Run the tester in a sub-process, to make sure there is only one
         # thread (for reliable signal delivery).
         tester = support.findfile("eintr_tester.py", subdir="eintrdata")
-        script_helper.assert_python_ok(tester)
+
+        # FIXME: Issue #25122, always run in verbose mode to debug hang on FreeBSD
+        if True: #support.verbose:
+            args = [sys.executable, tester]
+            with subprocess.Popen(args, stdout=sys.stderr) as proc:
+                exitcode = proc.wait()
+            self.assertEqual(exitcode, 0)
+        else:
+            script_helper.assert_python_ok(tester)
 
 
 if __name__ == "__main__":