Skip to content

Commit

Permalink
Merge pull request #198 from bastiak/members-fixes
Browse files Browse the repository at this point in the history
Members fixes
  • Loading branch information
rthalley committed Aug 4, 2016
2 parents 52e9579 + ecda6a0 commit 188aa70
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions tests/test_resolver.py
Expand Up @@ -102,7 +102,8 @@ class FakeAnswer(object):
def __init__(self, expiration):
self.expiration = expiration

class BaseResolverTests(object):

class BaseResolverTests(unittest.TestCase):

if sys.platform != 'win32':
def testRead(self):
Expand Down Expand Up @@ -246,7 +247,7 @@ def test_nxdomain_compatible(self):

try:
raise dns.resolver.NXDOMAIN
except Exception as e:
except dns.exception.DNSException as e:
if not py3:
self.assertTrue((e.message == e.__doc__))
self.assertTrue((e.args == (e.__doc__,)))
Expand All @@ -257,7 +258,7 @@ def test_nxdomain_compatible(self):

try:
raise dns.resolver.NXDOMAIN("errmsg")
except Exception as e:
except dns.exception.DNSException as e:
if not py3:
self.assertTrue((e.message == "errmsg"))
self.assertTrue((e.args == ("errmsg",)))
Expand All @@ -268,7 +269,7 @@ def test_nxdomain_compatible(self):

try:
raise dns.resolver.NXDOMAIN("errmsg", -1)
except Exception as e:
except dns.exception.DNSException as e:
if not py3:
self.assertTrue((e.message == ""))
self.assertTrue((e.args == ("errmsg", -1)))
Expand All @@ -294,7 +295,7 @@ def test_nxdomain_compatible(self):

try:
raise dns.resolver.NXDOMAIN(qnames=[n1])
except Exception as e:
except dns.exception.DNSException as e:
MSG = "The DNS query name does not exist: a.b."
if not py3:
self.assertTrue((e.message == MSG), e.message)
Expand Down

0 comments on commit 188aa70

Please sign in to comment.