Fix test_bad_address on Ubuntu 13.04

This commit is contained in:
Antoine Pitrou 2013-05-25 13:08:34 +02:00
commit 765f3cce48
1 changed files with 4 additions and 1 deletions

View File

@ -116,7 +116,10 @@ class urlopenNetworkTests(unittest.TestCase):
bogus_domain = "sadflkjsasf.i.nvali.d" bogus_domain = "sadflkjsasf.i.nvali.d"
try: try:
socket.gethostbyname(bogus_domain) socket.gethostbyname(bogus_domain)
except socket.gaierror: except OSError:
# socket.gaierror is too narrow, since getaddrinfo() may also
# fail with EAI_SYSTEM and ETIMEDOUT (seen on Ubuntu 13.04),
# i.e. Python's TimeoutError.
pass pass
else: else:
# This happens with some overzealous DNS providers such as OpenDNS # This happens with some overzealous DNS providers such as OpenDNS