From: Victor Stinner <victor.stinner@gmail.com>
Date: Sat, 24 Aug 2013 13:52:47 +0000 (+0200)
Subject: test_socket: cancel scheduled alarm on test failure
X-Git-Tag: v3.4.0a2~131^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=71fe8c00f6e2eda39d90c225c5f7635268cc4653;p=thirdparty%2FPython%2Fcpython.git

test_socket: cancel scheduled alarm on test failure
---

diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index fa9a65f15deb..9567090e996a 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -1216,6 +1216,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()