From 749a6a85c645648199eb4e855a9537a8b703ffeb Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Mon, 30 Mar 2015 22:09:14 +0200 Subject: [PATCH] Issue #23485: Fix test_signal, select.select() now retries the syscall if the signal handler does not raise an exception --- Lib/test/test_signal.py | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py index 8718eae689..65b36de9e1 100644 --- a/Lib/test/test_signal.py +++ b/Lib/test/test_signal.py @@ -418,13 +418,20 @@ class WakeupSignalTests(unittest.TestCase): TIMEOUT_FULL = 10 TIMEOUT_HALF = 5 + class InterruptSelect(Exception): + pass + + def handler(signum, frame): + raise InterruptSelect + signal.signal(signal.SIGALRM, handler) + signal.alarm(1) # We attempt to get a signal during the sleep, # before select is called try: select.select([], [], [], TIMEOUT_FULL) - except InterruptedError: + except InterruptSelect: pass else: raise Exception("select() was not interrupted") @@ -445,15 +452,22 @@ class WakeupSignalTests(unittest.TestCase): TIMEOUT_FULL = 10 TIMEOUT_HALF = 5 + class InterruptSelect(Exception): + pass + + def handler(signum, frame): + raise InterruptSelect + signal.signal(signal.SIGALRM, handler) + signal.alarm(1) before_time = time.monotonic() # We attempt to get a signal during the select call try: select.select([read], [], [], TIMEOUT_FULL) - except OSError: + except InterruptSelect: pass else: - raise Exception("OSError not raised") + raise Exception("select() was not interrupted") after_time = time.monotonic() dt = after_time - before_time if dt >= TIMEOUT_HALF: -- 2.50.1