diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2017-09-19 09:36:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-19 09:36:54 -0700 |
| commit | 9abee722d448c1c00c7d4e11ce242ec7b13e5c49 (patch) | |
| tree | 52af3dbb3ff6a4a8e28be76f43ef7d4df31deec6 /Lib/test/signalinterproctester.py | |
| parent | a92941ff12c1d554f42c05ed24621894a758b40f (diff) | |
| download | cpython-git-9abee722d448c1c00c7d4e11ce242ec7b13e5c49.tar.gz | |
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/signalinterproctester.py')
| -rw-r--r-- | Lib/test/signalinterproctester.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Lib/test/signalinterproctester.py b/Lib/test/signalinterproctester.py index d3ae170983..877be517c0 100644 --- a/Lib/test/signalinterproctester.py +++ b/Lib/test/signalinterproctester.py @@ -74,10 +74,13 @@ class InterProcessSignalTests(unittest.TestCase): # Nothing should happen: SIGUSR2 is ignored child.wait() - signal.alarm(1) - self.wait_signal(None, 'SIGALRM', KeyboardInterrupt) - self.assertEqual(self.got_signals, {'SIGHUP': 1, 'SIGUSR1': 1, - 'SIGALRM': 0}) + try: + signal.alarm(1) + self.wait_signal(None, 'SIGALRM', KeyboardInterrupt) + self.assertEqual(self.got_signals, {'SIGHUP': 1, 'SIGUSR1': 1, + 'SIGALRM': 0}) + finally: + signal.alarm(0) if __name__ == "__main__": |