commit 40996d3f6fbd1adcb2e69e426fa311aaf90762ff
author Victor Stinner <victor.stinner@gmail.com> Mon Sep 11 15:31:16 2017 -0700
committer GitHub <noreply@github.com> Mon Sep 11 15:31:16 2017 -0700
tree 358384b8c56dd468dda258e8f6c8b5b7730932a5
parent 004547f97067be2e23ae770f300c0c0d1db1ba27

bpo-17085: test_socket: cancel scheduled alarm on test failure (#3505)

(cherry picked from commit 71fe8c00f6e2eda39d90c225c5f7635268cc4653)

Lib/test/test_socket.py

diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index 2b20a79..bef1872 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -733,6 +733,7 @@
                 self.assertRaises(socket.timeout, c.sendall,
                                   b"x" * test_support.SOCK_MAX_SIZE)
         finally:
+            signal.alarm(0)
             signal.signal(signal.SIGALRM, old_alarm)
             c.close()
             s.close()