diff options
| author | Trent Nelson <trent.nelson@snakebite.org> | 2008-03-20 00:58:44 (GMT) |
|---|---|---|
| committer | Trent Nelson <trent.nelson@snakebite.org> | 2008-03-20 00:58:44 (GMT) |
| commit | 00b53ea1b8e66af47d7bbd519afde6f47497a551 (patch) | |
| tree | 2049b7946767ffdee0541fac26d249eccb3f1e50 /Lib | |
| parent | 68fa8e6c453cb9f084a6ee3168518a58588f4c14 (diff) | |
| download | cpython-00b53ea1b8e66af47d7bbd519afde6f47497a551.zip cpython-00b53ea1b8e66af47d7bbd519afde6f47497a551.tar.gz cpython-00b53ea1b8e66af47d7bbd519afde6f47497a551.tar.bz2 | |
Revert r61650; the intent of this commit was to try and address alarm failures on some of the build slaves. As Neal points out, it's called after test_main(), so it's not going to factor into the test when run via regrtest.py (and removes the original functionality that Jeffrey wanted that would kill the test if it took longer than 3 seconds to run when executing it directly during development).
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_socketserver.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Lib/test/test_socketserver.py b/Lib/test/test_socketserver.py index caac24a..bd25f57 100644 --- a/Lib/test/test_socketserver.py +++ b/Lib/test/test_socketserver.py @@ -253,7 +253,4 @@ def test_main(): if __name__ == "__main__": test_main() - # Signal an alarm after 20 seconds if we haven't shut down. This - # was originally 3 seconds, but has been bumped as numerous build - # slaves have been failing with SIGALMs on this test. - signal_alarm(20) + signal_alarm(3) # Shutdown shouldn't take more than 3 seconds. |