summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Peters <tim.peters@gmail.com>2006-03-18 02:47:38 (GMT)
committerTim Peters <tim.peters@gmail.com>2006-03-18 02:47:38 (GMT)
commitc612a5dbcaa6ddf4d1843d9aefb2891d6f72b2cd (patch)
treeaaf38326a0d3effb71fa9de8c7af0ec71f716be7
parentd9ca66f2b2073529c335cc953d202f4068a7a870 (diff)
downloadcpython-c612a5dbcaa6ddf4d1843d9aefb2891d6f72b2cd.zip
cpython-c612a5dbcaa6ddf4d1843d9aefb2891d6f72b2cd.tar.gz
cpython-c612a5dbcaa6ddf4d1843d9aefb2891d6f72b2cd.tar.bz2
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.
-rw-r--r--Lib/test/test_timeout.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_timeout.py b/Lib/test/test_timeout.py
index cb19d9e..444934b 100644
--- 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,