From: Thomas Wouters <thomas@python.org>
Date: Sun, 16 Apr 2006 15:22:41 +0000 (+0000)
Subject: Specialcase 'xs4all' (.nl/.net/.com/whatever else we have) as well as
X-Git-Tag: v2.5a2~193
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=993633c6f2531e31e907c33cf31ad384d57a86e1;p=python

Specialcase 'xs4all' (.nl/.net/.com/whatever else we have) as well as
'python.org' when deciding what server to use for the timeout tests; getting
tired of seeing the test fail on all my boxes ;P This'll still allow the
test to fail for hosts in the XS4ALL network that don't have an 'xs4all'
hostname, so maybe it should use a fallback scheme instead.
---

diff --git a/Lib/test/test_timeout.py b/Lib/test/test_timeout.py
index 444934b9e3..262007cf0e 100644
--- a/Lib/test/test_timeout.py
+++ b/Lib/test/test_timeout.py
@@ -113,7 +113,8 @@ 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']:
+        if (socket.getfqdn().split('.')[-2:] == ['python', 'org'] or
+            socket.getfqdn().split('.')[-2] == 'xs4all'):
             self.addr_remote = ('tut.fi', 80)
 
         _t1 = time.time()