diff options
| author |   Nick Coghlan <ncoghlan@gmail.com> | 2013-08-03 23:03:27 +1000 |
|---|---|---|
| committer | Nick Coghlan <ncoghlan@gmail.com> | 2013-08-03 23:03:27 +1000 |
| commit | 13371303351de5812c07d55dc29cacdef5cf1287 (patch) | |
| tree | fcbc82a5b0710d78f84676d809fc755cbb27e482 | |
| parent | Minor consistency fixes for some longobject.c exception messages: (diff) | |
| parent | Close #18396: fix spurious test_signal failure on Windows (diff) | |
| download | cpython-13371303351de5812c07d55dc29cacdef5cf1287.tar.gz cpython-13371303351de5812c07d55dc29cacdef5cf1287.tar.bz2 cpython-13371303351de5812c07d55dc29cacdef5cf1287.zip | |
Merge #18396 from 3.3
| -rw-r--r-- | Lib/test/test_signal.py | 10 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 11 insertions, 2 deletions
diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py index 24c2ac8efdc..1efb5f77f8d 100644 --- a/Lib/test/test_signal.py +++ b/Lib/test/test_signal.py @@ -206,11 +206,17 @@ class WindowsSignalTests(unittest.TestCase): def test_issue9324(self): # Updated for issue #10003, adding SIGBREAK handler = lambda x, y: None + checked = set() for sig in (signal.SIGABRT, signal.SIGBREAK, signal.SIGFPE, signal.SIGILL, signal.SIGINT, signal.SIGSEGV, signal.SIGTERM): - # Set and then reset a handler for signals that work on windows - signal.signal(sig, signal.signal(sig, handler)) + # Set and then reset a handler for signals that work on windows. + # Issue #18396, only for signals without a C-level handler. + if signal.getsignal(sig) is not None: + signal.signal(sig, signal.signal(sig, handler)) + checked.add(sig) + # Issue #18396: Ensure the above loop at least tested *something* + self.assertTrue(checked) with self.assertRaises(ValueError): signal.signal(-1, handler) diff --git a/Misc/NEWS b/Misc/NEWS index 868fb9ee693..f066212c50b 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -599,6 +599,9 @@ Library Tests ----- +- Issue #18396: Fix spurious test failure in test_signal on Windows when + faulthandler is enabled (Patch by Jeremy Kloth) + - Issue #17046: Fix broken test_executable_without_cwd in test_subprocess. - Issue #15415: Add new temp_dir() and change_cwd() context managers to |