Skip to content

Commit

Permalink
bpo-31629: Add support.SaveSignals (#4183)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
vstinner committed Oct 31, 2017
1 parent f0f62cc commit 19f6830
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 1 deletion.
39 changes: 39 additions & 0 deletions Lib/test/support/__init__.py
Expand Up @@ -2755,3 +2755,42 @@ def fd_count():
msvcrt.CrtSetReportMode(report_type, old_modes[report_type])

return count


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)
5 changes: 4 additions & 1 deletion Lib/test/test_curses.py
Expand Up @@ -15,7 +15,7 @@
import tempfile
import unittest

from test.support import requires, import_module, verbose
from test.support import requires, import_module, verbose, SaveSignals

# Optionally test curses module. This currently requires that the
# 'curses' resource be given on the regrtest command line using the -u
Expand Down Expand Up @@ -63,6 +63,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()
Expand All @@ -72,6 +74,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"
Expand Down

0 comments on commit 19f6830

Please sign in to comment.