diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2013-05-25 11:08:13 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2013-05-25 11:08:13 (GMT) |
| commit | 6b5a38c728bbca3273b6917308559cf22e298531 (patch) | |
| tree | 1928c7c4292a9e80b11336159c25058e3faf732a /Lib/test/test_urllibnet.py | |
| parent | 3b08a2978ec5c555850275dc4fbc15c803d264b2 (diff) | |
| download | cpython-6b5a38c728bbca3273b6917308559cf22e298531.zip cpython-6b5a38c728bbca3273b6917308559cf22e298531.tar.gz cpython-6b5a38c728bbca3273b6917308559cf22e298531.tar.bz2 | |
Fix test_bad_address on Ubuntu 13.04
Diffstat (limited to 'Lib/test/test_urllibnet.py')
| -rw-r--r-- | Lib/test/test_urllibnet.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/test/test_urllibnet.py b/Lib/test/test_urllibnet.py index d3fe69d..20efca6 100644 --- a/Lib/test/test_urllibnet.py +++ b/Lib/test/test_urllibnet.py @@ -116,7 +116,10 @@ class urlopenNetworkTests(unittest.TestCase): bogus_domain = "sadflkjsasf.i.nvali.d" try: 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 else: # This happens with some overzealous DNS providers such as OpenDNS |