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 69705593cb851be277d7d884e540398ba0b854f7..cb19d9eaea4c2af99ba6ed8fc65011569b88ed4c 100644 (file)
--- 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)