[Python-checkins] cpython (merge 3.3 -> default): Fix test_bad_address on Ubuntu 13.04
antoine.pitrou
python-checkins at python.org
Sat May 25 13:08:51 CEST 2013
http://hg.python.org/cpython/rev/6f8fef208958
changeset: 83917:6f8fef208958
parent: 83915:60310223d075
parent: 83916:b17662fc41af
user: Antoine Pitrou <solipsis at pitrou.net>
date: Sat May 25 13:08:34 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
More information about the Python-checkins
mailing list