[Python-checkins] cpython (merge 3.2 -> default): (merge 3.2) Issue #12250: test_socketserver uses a timeout of 60 seconds

[victor.stinner]

http://hg.python.org/cpython/rev/a609b2a44f92
changeset:   71328:a609b2a44f92
parent:      71325:ac1c3291a689
parent:      71327:05dfed82457a
user:        Victor Stinner <victor.stinner at haypocalc.com>
date:        Thu Jul 14 15:36:16 2011 +0200
summary:
  (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.

files:
  Lib/test/test_socketserver.py |  3 +--
  1 files changed, 1 insertions(+), 2 deletions(-)


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

-- 
Repository URL: http://hg.python.org/cpython