From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 8 Jul 2011 17:19:57 +0000 (+0200)
Subject: Avoid failing in test_urllibnet.test_bad_address when some overzealous
X-Git-Tag: v3.2.2rc1~132
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=72fff046a6d96131d2a929699e6fc8875f57e452;p=thirdparty%2FPython%2Fcpython.git

Avoid failing in test_urllibnet.test_bad_address when some overzealous
DNS service (e.g. OpenDNS) resolves a non-existent domain name.  The test
is now skipped instead.
---

diff --git a/Lib/test/test_urllibnet.py b/Lib/test/test_urllibnet.py
index 03d1708fdd66..383b2affd09d 100644
--- a/Lib/test/test_urllibnet.py
+++ b/Lib/test/test_urllibnet.py
@@ -113,6 +113,14 @@ class urlopenNetworkTests(unittest.TestCase):
     def test_bad_address(self):
         # Make sure proper exception is raised when connecting to a bogus
         # address.
+        bogus_domain = "sadflkjsasf.i.nvali.d"
+        try:
+            socket.gethostbyname(bogus_domain)
+        except socket.gaierror:
+            pass
+        else:
+            # This happens with some overzealous DNS providers such as OpenDNS
+            self.skipTest("%r should not resolve for test to work" % bogus_domain)
         self.assertRaises(IOError,
                           # SF patch 809915:  In Sep 2003, VeriSign started
                           # highjacking invalid .com and .net addresses to
diff --git a/Misc/NEWS b/Misc/NEWS
index 018d79923438..e415b4a04572 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -47,6 +47,10 @@ C-API
 Tests
 -----
 
+- Avoid failing in test_urllibnet.test_bad_address when some overzealous
+  DNS service (e.g. OpenDNS) resolves a non-existent domain name.  The test
+  is now skipped instead.
+
 - Issue #12440: When testing whether some bits in SSLContext.options can be
   reset, check the version of the OpenSSL headers Python was compiled against,
   rather than the runtime version of the OpenSSL library.