(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.
This commit is contained in:
Victor Stinner 2011-07-14 15:36:16 +02:00
commit bc18838972
1 changed files with 1 additions and 2 deletions

View File

@ -66,7 +66,7 @@ class SocketServerTest(unittest.TestCase):
"""Test all socket servers.""" """Test all socket servers."""
def setUp(self): def setUp(self):
signal_alarm(20) # Kill deadlocks after 20 seconds. signal_alarm(60) # Kill deadlocks after 60 seconds.
self.port_seed = 0 self.port_seed = 0
self.test_files = [] self.test_files = []
@ -283,4 +283,3 @@ def test_main():
if __name__ == "__main__": if __name__ == "__main__":
test_main() test_main()
signal_alarm(3) # Shutdown shouldn't take more than 3 seconds.