flo/nsupdate.info
1
0
Fork 0
Code Issues 1 Pull Requests 2 Packages Releases Activity

dnstools tests: always use the same TEST_HOST

Browse Source
This commit is contained in:
Thomas Waldmann 2013-11-09 23:19:05 +01:00
parent f13f4f474f
commit 4fadb5de82
2 changed files with 35 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
conftest.py
View File

@ -17,6 +17,7 @@ NAMESERVER_PUBLIC = True
# for some unittests # for some unittests
WWW_HOST = BASEDOMAIN WWW_HOST = BASEDOMAIN
NONEXISTING_HOST = 'nonexisting.' + BASEDOMAIN NONEXISTING_HOST = 'nonexisting.' + BASEDOMAIN
TEST_HOST = 'test.' + BASEDOMAIN
WWW_IPV4_HOST = 'ipv4.' + BASEDOMAIN WWW_IPV4_HOST = 'ipv4.' + BASEDOMAIN
WWW_IPV6_HOST = 'ipv6.' + BASEDOMAIN WWW_IPV6_HOST = 'ipv6.' + BASEDOMAIN
WWW_IPV4_IP = '85.10.192.104' WWW_IPV4_IP = '85.10.192.104'

76
nsupdate/main/_tests/test_dnstools.py
View File

@ -7,20 +7,25 @@ from test_settings import *
pytestmark = pytest.mark.django_db pytestmark = pytest.mark.django_db
from dns.resolver import NXDOMAIN from dns.resolver import NXDOMAIN, NoAnswer
from ..dnstools import add, delete, update, query_ns, parse_name, update_ns, SameIpError from ..dnstools import add, delete, update, query_ns, parse_name, update_ns, SameIpError
class TestIntelligentUpdater(object): def remove_records(host, records=('A', 'AAAA', )):
def test_double_update(self): # make sure the records are not there
host, ip = 'test0.' + BASEDOMAIN, '1.2.3.4' for record in records:
# make sure the host is not there
try: try:
update_ns(host, 'A', action='del') update_ns(host, record, action='del')
except NXDOMAIN: except (NXDOMAIN, NoAnswer):
# it is ok if it was never there # it is ok if it was never there
pass pass
class TestIntelligentUpdater(object):
def test_double_update(self):
host, ip = TEST_HOST, '1.2.3.4'
remove_records(host)
# first update with this IP, should work without issue: # first update with this IP, should work without issue:
update(host, ip) update(host, ip)
assert query_ns(host, 'A') == ip assert query_ns(host, 'A') == ip
@ -31,13 +36,8 @@ class TestIntelligentUpdater(object):
class TestIntelligentAdder(object): class TestIntelligentAdder(object):
def test_double_add_same(self): def test_double_add_same(self):
host, ip = 'test0.' + BASEDOMAIN, '1.2.3.4' host, ip = TEST_HOST, '1.2.3.4'
# make sure the host is not there remove_records(host)
try:
update_ns(host, 'A', action='del')
except NXDOMAIN:
# it is ok if it was never there
pass
# first add with this IP, should work without issue: # first add with this IP, should work without issue:
add(host, ip) add(host, ip)
assert query_ns(host, 'A') == ip assert query_ns(host, 'A') == ip
@ -46,13 +46,8 @@ class TestIntelligentAdder(object):
add(host, ip) add(host, ip)
def test_double_add_different(self): def test_double_add_different(self):
host, ip = 'test0.' + BASEDOMAIN, '1.2.3.4' host, ip = TEST_HOST, '1.2.3.4'
# make sure the host is not there remove_records(host)
try:
update_ns(host, 'A', action='del')
except NXDOMAIN:
# it is ok if it was never there
pass
# first add with this IP, should work without issue: # first add with this IP, should work without issue:
add(host, ip) add(host, ip)
assert query_ns(host, 'A') == ip assert query_ns(host, 'A') == ip
@ -64,7 +59,7 @@ class TestIntelligentAdder(object):
class TestIntelligentDeleter(object): class TestIntelligentDeleter(object):
def test_delete(self): def test_delete(self):
host, ip = 'test0.' + BASEDOMAIN, '1.2.3.4' host, ip = TEST_HOST, '1.2.3.4'
# make sure the host is there # make sure the host is there
update_ns(host, 'A', ip, action='add') update_ns(host, 'A', ip, action='add')
delete(host) delete(host)
@ -73,13 +68,8 @@ class TestIntelligentDeleter(object):
query_ns(host, 'A') query_ns(host, 'A')
def test_double_delete(self): def test_double_delete(self):
host = 'test0.' + BASEDOMAIN host = TEST_HOST
# make sure the host is not there remove_records(host)
try:
update_ns(host, 'A', action='del')
except NXDOMAIN:
# it is ok if it was never there
pass
delete(host) # hmm, this doesn't raise NXDOMAIN!? delete(host) # hmm, this doesn't raise NXDOMAIN!?
@ -99,14 +89,14 @@ class TestQuery(object):
class TestUpdate(object): class TestUpdate(object):
def test_parse1(self): def test_parse1(self):
origin, relname = parse_name('foo.' + BASEDOMAIN) origin, relname = parse_name('test.' + BASEDOMAIN)
assert str(origin) == BASEDOMAIN + '.' assert str(origin) == BASEDOMAIN + '.'
assert str(relname) == 'foo' assert str(relname) == 'test'
def test_parse2(self): def test_parse2(self):
origin, relname = parse_name('foo.bar.' + BASEDOMAIN) origin, relname = parse_name('foo.test.' + BASEDOMAIN)
assert str(origin) == BASEDOMAIN + '.' assert str(origin) == BASEDOMAIN + '.'
assert str(relname) == 'foo.bar' assert str(relname) == 'foo.test'
def test_parse_with_origin(self): def test_parse_with_origin(self):
origin, relname = parse_name('foo.bar.baz.org', 'bar.baz.org') origin, relname = parse_name('foo.bar.baz.org', 'bar.baz.org')
@ -114,7 +104,8 @@ class TestUpdate(object):
assert str(relname) == 'foo' assert str(relname) == 'foo'
def test_add_del_v4(self): def test_add_del_v4(self):
host, ip = 'test1.' + BASEDOMAIN, '1.1.1.1' host, ip = TEST_HOST, '1.1.1.1'
remove_records(host)
response = update_ns(host, 'A', ip, action='add', ttl=60) response = update_ns(host, 'A', ip, action='add', ttl=60)
print response print response
assert query_ns(host, 'A') == ip assert query_ns(host, 'A') == ip
@ -124,18 +115,19 @@ class TestUpdate(object):
query_ns(host, 'A') == ip query_ns(host, 'A') == ip
def test_update_v4(self): def test_update_v4(self):
host, ip = 'test2.' + BASEDOMAIN, '2.2.2.2' host, ip = TEST_HOST, '2.2.2.2'
response = update_ns(host, 'A', ip, action='upd', ttl=60) response = update_ns(host, 'A', ip, action='upd', ttl=60)
print response print response
assert query_ns(host, 'A') == ip assert query_ns(host, 'A') == ip
host, ip = 'test2.' + BASEDOMAIN, '3.3.3.3' host, ip = TEST_HOST, '3.3.3.3'
response = update_ns(host, 'A', ip, action='upd', ttl=60) response = update_ns(host, 'A', ip, action='upd', ttl=60)
print response print response
assert query_ns(host, 'A') == ip assert query_ns(host, 'A') == ip
def test_add_del_v6(self): def test_add_del_v6(self):
host, ip = 'test3.' + BASEDOMAIN, '::1' host, ip = TEST_HOST, '::1'
remove_records(host)
response = update_ns(host, 'AAAA', ip, action='add', ttl=60) response = update_ns(host, 'AAAA', ip, action='add', ttl=60)
print response print response
assert query_ns(host, 'AAAA') == ip assert query_ns(host, 'AAAA') == ip
@ -145,23 +137,23 @@ class TestUpdate(object):
query_ns(host, 'AAAA') == ip query_ns(host, 'AAAA') == ip
def test_update_v6(self): def test_update_v6(self):
host, ip = 'test4.' + BASEDOMAIN, '::2' host, ip = TEST_HOST, '::2'
response = update_ns(host, 'AAAA', ip, action='upd', ttl=60) response = update_ns(host, 'AAAA', ip, action='upd', ttl=60)
print response print response
assert query_ns(host, 'AAAA') == ip assert query_ns(host, 'AAAA') == ip
host, ip = 'test4.' + BASEDOMAIN, '::3' host, ip = TEST_HOST, '::3'
response = update_ns(host, 'AAAA', ip, action='upd', ttl=60) response = update_ns(host, 'AAAA', ip, action='upd', ttl=60)
print response print response
assert query_ns(host, 'AAAA') == ip assert query_ns(host, 'AAAA') == ip
def test_update_mixed(self): def test_update_mixed(self):
host4, ip4 = 'test5.' + BASEDOMAIN, '4.4.4.4' host4, ip4 = TEST_HOST, '4.4.4.4'
response = update_ns(host4, 'A', ip4, action='upd', ttl=60) response = update_ns(host4, 'A', ip4, action='upd', ttl=60)
print response print response
assert query_ns(host4, 'A') == ip4 assert query_ns(host4, 'A') == ip4
host6, ip6 = 'test5.' + BASEDOMAIN, '::4' host6, ip6 = TEST_HOST, '::4'
response = update_ns(host6, 'AAAA', ip6, action='upd', ttl=60) response = update_ns(host6, 'AAAA', ip6, action='upd', ttl=60)
print response print response
assert query_ns(host6, 'AAAA') == ip6 assert query_ns(host6, 'AAAA') == ip6
@ -169,7 +161,7 @@ class TestUpdate(object):
# make sure the v4 is unchanged # make sure the v4 is unchanged
assert query_ns(host4, 'A') == ip4 assert query_ns(host4, 'A') == ip4
host4, ip4 = 'test5.' + BASEDOMAIN, '5.5.5.5' host4, ip4 = TEST_HOST, '5.5.5.5'
response = update_ns(host4, 'A', ip4, action='upd', ttl=60) response = update_ns(host4, 'A', ip4, action='upd', ttl=60)
print response print response
assert query_ns(host4, 'A') == ip4 assert query_ns(host4, 'A') == ip4