(merge 3.2) 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.

1 files changed, 1 insertions, 2 deletions

diff --git a/Lib/test/test_socketserver.py b/Lib/test/test_socketserver.py
index d4c3621..08d79c0 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 = []
 
@@ -283,4 +283,3 @@ def test_main():
 
 if __name__ == "__main__":
     test_main()
-    signal_alarm(3)  # Shutdown shouldn't take more than 3 seconds.