diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2017-09-19 16:36:54 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-19 16:36:54 (GMT) |
| commit | 9abee722d448c1c00c7d4e11ce242ec7b13e5c49 (patch) | |
| tree | 52af3dbb3ff6a4a8e28be76f43ef7d4df31deec6 /Lib/test/test_pty.py | |
| parent | a92941ff12c1d554f42c05ed24621894a758b40f (diff) | |
| download | cpython-9abee722d448c1c00c7d4e11ce242ec7b13e5c49.zip cpython-9abee722d448c1c00c7d4e11ce242ec7b13e5c49.tar.gz cpython-9abee722d448c1c00c7d4e11ce242ec7b13e5c49.tar.bz2 | |
bpo-31479: Always reset the signal alarm in tests (#3588)
* bpo-31479: Always reset the signal alarm in tests
Use "try: ... finally: signal.signal(0)" pattern to make sure that
tests don't "leak" a pending fatal signal alarm.
* Move two more alarm() calls into the try block
Fix also typo: replace signal.signal(0) with signal.alarm(0)
* Move another signal.alarm() into the try block
Diffstat (limited to 'Lib/test/test_pty.py')
| -rw-r--r-- | Lib/test/test_pty.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Lib/test/test_pty.py b/Lib/test/test_pty.py index b6e2ed5..f283e19 100644 --- a/Lib/test/test_pty.py +++ b/Lib/test/test_pty.py @@ -51,14 +51,11 @@ class PtyTest(unittest.TestCase): def setUp(self): # isatty() and close() can hang on some platforms. Set an alarm # before running the test to make sure we don't hang forever. - self.old_alarm = signal.signal(signal.SIGALRM, self.handle_sig) + old_alarm = signal.signal(signal.SIGALRM, self.handle_sig) + self.addCleanup(signal.signal, signal.SIGALRM, old_alarm) + self.addCleanup(signal.alarm, 0) signal.alarm(10) - def tearDown(self): - # remove alarm, restore old alarm handler - signal.alarm(0) - signal.signal(signal.SIGALRM, self.old_alarm) - def handle_sig(self, sig, frame): self.fail("isatty hung") |