diff options
| author | Victor Stinner <vstinner@redhat.com> | 2018-06-01 15:23:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-01 15:23:10 +0200 |
| commit | 95681c7a7ddd436ba7d6c10d1202c33dd6bd648b (patch) | |
| tree | 09d65225dac18d9be9dc0eb71cc8fca13c68f361 /Lib/test/test_threadsignals.py | |
| parent | 8f7bd307ce54570275700523532c1e098ce67b60 (diff) | |
| download | cpython-git-95681c7a7ddd436ba7d6c10d1202c33dd6bd648b.tar.gz | |
bpo-31479: Always reset the signal alarm in tests (GH-3588) (GH-7312)
* 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
(cherry picked from commit 9abee722d448c1c00c7d4e11ce242ec7b13e5c49)
Diffstat (limited to 'Lib/test/test_threadsignals.py')
| -rw-r--r-- | Lib/test/test_threadsignals.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Lib/test/test_threadsignals.py b/Lib/test/test_threadsignals.py index 9d92742375..7d4d8c4106 100644 --- a/Lib/test/test_threadsignals.py +++ b/Lib/test/test_threadsignals.py @@ -54,9 +54,11 @@ class ThreadSignals(unittest.TestCase): # wait for it return. if signal_blackboard[signal.SIGUSR1]['tripped'] == 0 \ or signal_blackboard[signal.SIGUSR2]['tripped'] == 0: - signal.alarm(1) - signal.pause() - signal.alarm(0) + try: + signal.alarm(1) + signal.pause() + finally: + signal.alarm(0) self.assertEqual( signal_blackboard[signal.SIGUSR1]['tripped'], 1) self.assertEqual( signal_blackboard[signal.SIGUSR1]['tripped_by'], @@ -96,6 +98,7 @@ class ThreadSignals(unittest.TestCase): # after timeout return of lock.acquire() (which can fool assertRaises). self.assertLess(dt, 3.0) finally: + signal.alarm(0) signal.signal(signal.SIGALRM, oldalrm) @unittest.skipIf(USING_PTHREAD_COND, @@ -127,6 +130,7 @@ class ThreadSignals(unittest.TestCase): # See rationale above in test_lock_acquire_interruption self.assertLess(dt, 3.0) finally: + signal.alarm(0) signal.signal(signal.SIGALRM, oldalrm) def acquire_retries_on_intr(self, lock): |