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.1~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3aba49899c1f78daf1bafce5b1fd46acbd15b2f2;p=python

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 03d1708fdd..383b2affd0 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 1518bd1fb1..e4ddb3cd5d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -16,6 +16,13 @@ Library
 - Issue #12467: warnings: fix a race condition if a warning is emitted at
   shutdown, if globals()['__file__'] is None.
 
+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.
+
 
 What's New in Python 3.2.1 release candidate 2?
 ===============================================