summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2011-07-14 14:53:24 +0200
committerVictor Stinner <victor.stinner@haypocalc.com>2011-07-14 14:53:24 +0200
commitb30ac940db4ef062ea708d1e60a59931e2514a6f (patch)
treecea75c22ae9ec28f46aedf1d9b1b062755d04aa3
parentcec795d63905fc1ca64430234bc61ddf0c981f5a (diff)
downloadcpython-git-b30ac940db4ef062ea708d1e60a59931e2514a6f.tar.gz
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.
-rw-r--r--Lib/test/test_socketserver.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/Lib/test/test_socketserver.py b/Lib/test/test_socketserver.py
index 4825a4aed5..41634e73a2 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.