diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py index 8718eae689c..65b36de9e19 100644 --- a/Lib/test/test_signal.py +++ b/Lib/test/test_signal.py @@ -418,13 +418,20 @@ def test_wakeup_fd_early(self): 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 @@ def test_wakeup_fd_during(self): 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: