From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Thu, 14 Jul 2011 12:53:24 +0000 (+0200)
Subject: Issue #12250: test_socketserver uses a timeout of 60 seconds instead of 20
X-Git-Tag: v2.7.3rc1~613
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b30ac940db4ef062ea708d1e60a59931e2514a6f;p=thirdparty%2FPython%2Fcpython.git

Issue #12250: test_socketserver uses a timeout of 60 seconds instead of 20

test_shutdown() may fail on very slow buildbots like FreeBSD 6.4 just because
of the arbitrary timeout.
---

diff --git a/Lib/test/test_socketserver.py b/Lib/test/test_socketserver.py
index 4825a4aed55c..41634e73a22a 100644
--- a/Lib/test/test_socketserver.py
+++ b/Lib/test/test_socketserver.py
@@ -66,7 +66,7 @@ class SocketServerTest(unittest.TestCase):
     """Test all socket servers."""
 
     def setUp(self):
-        signal_alarm(20)  # Kill deadlocks after 20 seconds.
+        signal_alarm(60)  # Kill deadlocks after 60 seconds.
         self.port_seed = 0
         self.test_files = []
 
@@ -281,4 +281,3 @@ def test_main():
 
 if __name__ == "__main__":
     test_main()
-    signal_alarm(3)  # Shutdown shouldn't take more than 3 seconds.