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

e726ce1f · Victor Stinner · 3a7dffa4 · 71fe8c00 · e726ce1f
Commit e726ce1f authored Aug 24, 2013 by Victor Stinner
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

Lib/test/test_socket.py Lib/test/test_socket.py +1 -0

No files found.
--- 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()