From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 25 May 2013 11:08:13 +0000 (+0200)
Subject: Fix test_bad_address on Ubuntu 13.04
X-Git-Tag: v3.4.0a1~642^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6b5a38c728bbca3273b6917308559cf22e298531;p=thirdparty%2FPython%2Fcpython.git

Fix test_bad_address on Ubuntu 13.04
---

diff --git a/Lib/test/test_urllibnet.py b/Lib/test/test_urllibnet.py
index d3fe69dbcef7..20efca6adbff 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