summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_timeout.py
diff options
context:
space:
mode:
authorThomas Wouters <thomas@python.org>2006-04-16 15:22:41 (GMT)
committerThomas Wouters <thomas@python.org>2006-04-16 15:22:41 (GMT)
commit993633c6f2531e31e907c33cf31ad384d57a86e1 (patch)
tree492e23270b0142a3ae3c0dd7242f003d0b8a1652 /Lib/test/test_timeout.py
parent631f513fd8c49873624a48cbc9f46e8e934fb905 (diff)
downloadcpython-993633c6f2531e31e907c33cf31ad384d57a86e1.zip
cpython-993633c6f2531e31e907c33cf31ad384d57a86e1.tar.gz
cpython-993633c6f2531e31e907c33cf31ad384d57a86e1.tar.bz2
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.
Diffstat (limited to 'Lib/test/test_timeout.py')
-rw-r--r--Lib/test/test_timeout.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/test_timeout.py b/Lib/test/test_timeout.py
index 444934b..262007c 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()