https://github.com/python/cpython/commit/1d481822a6295e6739da2d5cca0fdbede51... commit: 1d481822a6295e6739da2d5cca0fdbede51fda22 branch: 2.7 author: Victor Stinner <victor.stinner@gmail.com> committer: GitHub <noreply@github.com> date: 2017-10-31T03:44:55-07:00 summary: bpo-31629: Add support.SaveSignals (#4183) (#4188) test_curses now saves/restores signals. On FreeBSD, the curses module sets handlers of some signals, but don't restore old handlers when the module is deinitialized. (cherry picked from commit 19f68301a1295a9c30d9f28b8f1479cdcccd75aa) files: M Lib/test/support/__init__.py M Lib/test/test_curses.py diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py index d14a6620b5d..cc594865ebb 100644 --- a/Lib/test/support/__init__.py +++ b/Lib/test/support/__init__.py @@ -1966,3 +1966,42 @@ def _crash_python(): import _testcapi with SuppressCrashReport(): _testcapi._read_null() + + +class SaveSignals: + """ + Save an restore signal handlers. + + This class is only able to save/restore signal handlers registered + by the Python signal module: see bpo-13285 for "external" signal + handlers. + """ + + def __init__(self): + import signal + self.signal = signal + self.signals = list(range(1, signal.NSIG)) + # SIGKILL and SIGSTOP signals cannot be ignored nor catched + for signame in ('SIGKILL', 'SIGSTOP'): + try: + signum = getattr(signal, signame) + except AttributeError: + continue + self.signals.remove(signum) + self.handlers = {} + + def save(self): + for signum in self.signals: + handler = self.signal.getsignal(signum) + if handler is None: + # getsignal() returns None if a signal handler was not + # registered by the Python signal module, + # and the handler is not SIG_DFL nor SIG_IGN. + # + # Ignore the signal: we cannot restore the handler. + continue + self.handlers[signum] = handler + + def restore(self): + for signum, handler in self.handlers.items(): + self.signal.signal(signum, handler) diff --git a/Lib/test/test_curses.py b/Lib/test/test_curses.py index 84b6bfddca5..743e56ec9cf 100644 --- a/Lib/test/test_curses.py +++ b/Lib/test/test_curses.py @@ -15,7 +15,9 @@ import tempfile import unittest -from test.test_support import requires, import_module, verbose, run_unittest +from test.support import (requires, import_module, verbose, run_unittest, + SaveSignals) + # Optionally test curses module. This currently requires that the # 'curses' resource be given on the regrtest command line using the -u @@ -62,6 +64,8 @@ def tearDownClass(cls): del cls.tmp def setUp(self): + self.save_signals = SaveSignals() + self.save_signals.save() if verbose: # just to make the test output a little more readable print('') @@ -71,6 +75,7 @@ def setUp(self): def tearDown(self): curses.resetty() curses.endwin() + self.save_signals.restore() def test_window_funcs(self): "Test the methods of windows"