changeset: 71328:a609b2a44f92 parent: 71325:ac1c3291a689 parent: 71327:05dfed82457a user: Victor Stinner date: Thu Jul 14 15:36:16 2011 +0200 description: (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. diff -r ac1c3291a689 -r a609b2a44f92 Lib/test/test_socketserver.py --- a/Lib/test/test_socketserver.py Thu Jul 14 15:57:12 2011 +0300 +++ b/Lib/test/test_socketserver.py Thu Jul 14 15:36:16 2011 +0200 @@ -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.

AltStyle によって変換されたページ (->オリジナル) /