(Merge 3.3) test_socket: cancel scheduled alarm on test failure

2013-08-24 15:53:39 +02:00 · 2013-08-24 15:53:39 +02:00 · e726ce1f3e
parent 3a7dffa4ce 71fe8c00f6
commit e726ce1f3e
1 changed files with 1 additions and 0 deletions
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@ -1251,6 +1251,7 @@ class GeneralModuleTests(unittest.TestCase):
                signal.alarm(1)
                self.assertRaises(socket.timeout, c.sendall, b"x" * (1024**2))
        finally:
+            signal.alarm(0)
            signal.signal(signal.SIGALRM, old_alarm)
            c.close()
            s.close()