[Python-checkins] cpython (3.3): Fix test_bad_address on Ubuntu 13.04

[antoine.pitrou]

http://hg.python.org/cpython/rev/b17662fc41af
changeset:   83916:b17662fc41af
branch:      3.3
parent:      83912:7935844c6737
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sat May 25 13:08:13 2013 +0200
summary:
  Fix test_bad_address on Ubuntu 13.04

files:
  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
--- a/Lib/test/test_urllibnet.py
+++ b/Lib/test/test_urllibnet.py
@@ -116,7 +116,10 @@
         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

-- 
Repository URL: http://hg.python.org/cpython