Merge rev 43091 from the trunk.

"""
Try to find a host that responds slower from python.org so this test
does not fail on macteagle (G4 OSX.4 in buildbot)
"""

Since testConnectTimeout() frequently fails in the same way in 2.4
branch, and this patch seems to have fixed it on the trunk, it
should fix it on the 2.4 branch too.

diff --git a/Lib/test/test_timeout.py b/Lib/test/test_timeout.py
index cb19d9eaea4c2af99ba6ed8fc65011569b88ed4c..444934b9e3592474ab1ce6f5b80fe569e8cdff57 100644 (file)
--- a/Lib/test/test_timeout.py
+++ b/Lib/test/test_timeout.py
@@ -114,7 +114,7 @@ class TimeoutTestCase(unittest.TestCase):
         # If we are too close to www.python.org, this test will fail.
         # Pick a host that should be farther away.
         if socket.getfqdn().split('.')[-2:] == ['python', 'org']:
-            self.addr_remote = ('python.net', 80)
+            self.addr_remote = ('tut.fi', 80)
 
         _t1 = time.time()
         self.failUnlessRaises(socket.error, self.sock.connect,