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 444934b9e3592474ab1ce6f5b80fe569e8cdff57..262007cf0e7525a323131a15eee65f7529fdb23d 100644 (file)
--- 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()