From: Bob Halley <halley@dnspython.org>
Date: Sun, 8 May 2016 18:29:29 +0000 (-0700)
Subject: revert bad merge
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d0d43f95770eac75cfd8c5ba2b7ca7df7d14a3f0;p=thirdparty%2Fdnspython.git

revert bad merge
---

diff --git a/tests/test_resolver.py b/tests/test_resolver.py
index 4817f6ef..f3c0d35a 100644
--- a/tests/test_resolver.py
+++ b/tests/test_resolver.py
@@ -18,7 +18,6 @@ import select
 import sys
 import time
 import unittest
-import urllib
 
 import dns.name
 import dns.message
@@ -48,13 +47,6 @@ example. 1 IN A 10.0.0.1
 ;ADDITIONAL
 """
 
-try:
-    with network = urllib.request.urlopen('http://www.dnspython.org/',
-                                  timeout=1) as response:
-        network = (response.getcode() == 200)
-except urllib.error.URLError:
-    network = False
-
 class FakeAnswer(object):
     def __init__(self, expiration):
         self.expiration = expiration
@@ -90,21 +82,18 @@ class BaseResolverTests(object):
         self.assertTrue(cache.get((name, dns.rdatatype.A, dns.rdataclass.IN))
                         is None)
 
-    @unittest.skipUnless(network, "requires network access")
     def testZoneForName1(self):
         name = dns.name.from_text('www.dnspython.org.')
         ezname = dns.name.from_text('dnspython.org.')
         zname = dns.resolver.zone_for_name(name)
         self.assertTrue(zname == ezname)
 
-    @unittest.skipUnless(network, "requires network access")
     def testZoneForName2(self):
         name = dns.name.from_text('a.b.www.dnspython.org.')
         ezname = dns.name.from_text('dnspython.org.')
         zname = dns.resolver.zone_for_name(name)
         self.assertTrue(zname == ezname)
 
-    @unittest.skipUnless(network, "requires network access")
     def testZoneForName3(self):
         name = dns.name.from_text('dnspython.org.')
         ezname = dns.name.from_text('dnspython.org.')