summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Halley <halley@dnspython.org>2016-05-08 11:29:29 -0700
committerBob Halley <halley@dnspython.org>2016-05-08 11:29:29 -0700
commitd0d43f95770eac75cfd8c5ba2b7ca7df7d14a3f0 (patch)
treefe0e2e01629be3f567698a60a5c565c0e2718513
parentf5a636cd822224929fdfd09d07cafb678dc94b8b (diff)
downloaddnspython-d0d43f95770eac75cfd8c5ba2b7ca7df7d14a3f0.tar.gz
revert bad merge
-rw-r--r--tests/test_resolver.py11
1 files changed, 0 insertions, 11 deletions
diff --git a/tests/test_resolver.py b/tests/test_resolver.py
index 4817f6e..f3c0d35 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.')