summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2011-05-03 14:11:22 +0200
committerVictor Stinner <victor.stinner@haypocalc.com>2011-05-03 14:11:22 +0200
commit4b8dd247e048d257220024d988dcc80c18ca3114 (patch)
tree00a136bb0ef640c392a678b2845c723acb08bc23
parent23a60f771fbbb3b573d045987f580943ac1923f4 (diff)
downloadcpython-4b8dd247e048d257220024d988dcc80c18ca3114.tar.gz
Issue #8407: Fix pthread_sigmask() tests on Mac OS X
Disable faulthandler timeout thread on Mac OS X: it interacts with pthread_sigmask() tests.
-rw-r--r--Lib/test/test_signal.py15
1 files changed, 15 insertions, 0 deletions
diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
index 809da3a8b6..5caf13d8d6 100644
--- a/Lib/test/test_signal.py
+++ b/Lib/test/test_signal.py
@@ -504,6 +504,21 @@ class PthreadSigmaskTests(unittest.TestCase):
def read_sigmask():
return signal.pthread_sigmask(signal.SIG_BLOCK, [])
+ if sys.platform == "darwin":
+ import faulthandler
+ # The fault handler timeout thread masks all signals. If the main
+ # thread masks also SIGUSR1, all threads mask this signal. In this
+ # case, on Mac OS X, if we send SIGUSR1 to the process, the signal
+ # is pending in the main or the faulthandler timeout thread.
+ # Unblock SIGUSR1 in the main thread calls the signal handler only
+ # if the signal is pending for the main thread.
+ #
+ # Stop the faulthandler timeout thread to workaround this problem.
+ # Another solution would be to send the signal directly to the main
+ # thread using pthread_kill(), but Python doesn't expose this
+ # function.
+ faulthandler.cancel_dump_tracebacks_later()
+
old_handler = signal.signal(signum, handler)
self.addCleanup(signal.signal, signum, old_handler)