From: Neal Norwitz <nnorwitz@gmail.com>
Date: Sat, 18 Feb 2006 21:20:31 +0000 (+0000)
Subject: This should get test_timeout to pass when running on any python.org host.  Will backport
X-Git-Tag: v2.5a0~613
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d5b671508369dd8a33b0370beb3589ef98cbeef2;p=python

This should get test_timeout to pass when running on any python.org host.  Will backport
---

diff --git a/Lib/test/test_timeout.py b/Lib/test/test_timeout.py
index 69705593cb..cb19d9eaea 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)