From: Neal Norwitz <nnorwitz@gmail.com>
Date: Sat, 18 Feb 2006 21:25:56 +0000 (+0000)
Subject: Backport: This should get test_timeout to pass when running on any python.org host.
X-Git-Tag: v2.4.3c1~74
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f3cba11e55da33f6c83ba831716237b672cfcc42;p=thirdparty%2FPython%2Fcpython.git

Backport: This should get test_timeout to pass when running on any python.org host.
---

diff --git a/Lib/test/test_timeout.py b/Lib/test/test_timeout.py
index 69705593cb85..cb19d9eaea4c 100644
--- a/Lib/test/test_timeout.py
+++ b/Lib/test/test_timeout.py
@@ -111,6 +111,11 @@ class TimeoutTestCase(unittest.TestCase):
         _timeout = 0.001
         self.sock.settimeout(_timeout)
 
+        # 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)
+
         _t1 = time.time()
         self.failUnlessRaises(socket.error, self.sock.connect,
                 self.addr_remote)