Commit 00dd2cbd authored by Daniel Salzman's avatar Daniel Salzman

tests-extra: merge test zones cname-loop. and wild. into records.

parent 8038bfc5
$ORIGIN cname-loop.
$TTL 3600
@ SOA dns1 hostmaster 2010111213 10800 3600 1209600 7200
NS dns1
NS dns2
MX 10 mail
dns1 A 192.0.2.1
AAAA 2001:DB8::1
dns2 A 192.0.2.2
AAAA 2001:DB8::2
mail A 192.0.2.3
AAAA 2001:DB8::3
*.loop1 CNAME a.loop2
*.loop2 CNAME a.loop1
$ORIGIN records.
$TTL 3600
@ SOA dns1 hostmaster 2010111201 10800 3600 1209600 7200
@ SOA dns1 HOSTmaster 2010111201 10800 3600 1209600 7200
NS dns1
NS dns2
MX 10 mail
......@@ -59,7 +59,20 @@ eui48 EUI48 00-00-5e-00-53-2a
eui64 EUI64 00-00-5e-ef-10-00-00-2a
; Miscellaneous
empty IN TYPE999 \# 0
empty IN TYPE999 \# 0
UPPER-case MX 10 MaiL
str-test HINFO "" ""
TXT "x\012\001\y z"
TXT "" ""
TXT ahoj "" ""
TXT "" ahoj \"\ \#
TXT "\\" "\""
TXT "ahoj" "" "nevim"
NAPTR 20 0 "s" "SIP+D2U" "" sip._udp.wild.
; CNAME loop
*.loop1 CNAME a.loop2
*.loop2 CNAME a.loop1
; Reported bugs
3.1.1.1.1.1.1.1.1.2.7.9.9 172800 NAPTR 1 1 "u" "E2U+sip" "!^.*$!sip:123@freeswitch.org!" .
$ORIGIN wild.
$TTL 3600
@ SOA dns1 Hostmaster 2010111213 10800 3600 1209600 7200
NS dns1
NS dns2
MX 10 mail
dns1 A 192.0.2.1
AAAA 2001:DB8::1
dns2 A 192.0.2.2
AAAA 2001:DB8::2
mail A 192.0.2.3
AAAA 2001:DB8::3
test HINFO "" ""
TXT "x\012\001\y z"
TXT "" ""
TXT ahoj "" ""
TXT "" ahoj \"\ \#
TXT "\\" "\""
TXT "ahoj" "" "nevim"
NAPTR 20 0 "s" "SIP+D2U" "" sip._udp.wild.
Upper-case MX 10 MaiL
......@@ -8,8 +8,7 @@ t = Test()
master = t.server("bind")
slave = t.server("knot")
zones = t.zone_rnd(10) + t.zone(".") + t.zone("wild.") + \
t.zone("cname-loop.")
zones = t.zone_rnd(10) + t.zone(".") + t.zone("records.")
t.link(zones, master, slave)
......
......@@ -8,8 +8,7 @@ t = Test()
master = t.server("knot")
slave = t.server("bind")
zones = t.zone_rnd(10) + t.zone(".") + t.zone("wild.") + \
t.zone("cname-loop.") + t.zone("records.")
zones = t.zone_rnd(10) + t.zone(".") + t.zone("records.")
t.link(zones, master, slave)
......
......@@ -8,8 +8,7 @@ t = Test()
master = t.server("knot")
slave = t.server("knot")
zones = t.zone_rnd(10) + t.zone(".") + t.zone("wild.") + \
t.zone("cname-loop.") + t.zone("records.")
zones = t.zone_rnd(10) + t.zone(".") + t.zone("records.")
t.link(zones, master, slave)
......
......@@ -8,8 +8,7 @@ t = Test()
master = t.server("bind")
slave = t.server("knot")
zones = t.zone_rnd(5, records=50) + t.zone("wild.") + \
t.zone("cname-loop.") + t.zone("records.")
zones = t.zone_rnd(5, records=50) + t.zone("records.")
t.link(zones, master, slave, ixfr=True)
......
......@@ -8,8 +8,7 @@ t = Test()
master = t.server("knot")
slave = t.server("bind")
zones = t.zone_rnd(5, records=50) + t.zone("wild.") + \
t.zone("cname-loop.") + t.zone("records.")
zones = t.zone_rnd(5, records=50) + t.zone("records.")
t.link(zones, master, slave, ixfr=True)
......
......@@ -8,8 +8,7 @@ t = Test()
master = t.server("knot")
slave = t.server("knot")
zones = t.zone_rnd(5, records=50) + t.zone("wild.") + \
t.zone("cname-loop.") + t.zone("records.")
zones = t.zone_rnd(5, records=50) + t.zone("records.")
t.link(zones, master, slave, ixfr=True)
......
......@@ -10,7 +10,7 @@ master = t.server("bind")
slave = t.server("knot")
reference = t.server("bind")
zones = t.zone_rnd(10) + t.zone(".") + t.zone("wild.") + t.zone("cname-loop.")
zones = t.zone_rnd(4) + t.zone(".") + t.zone("records.")
t.link(zones, master, slave)
t.link(zones, reference)
......
......@@ -8,7 +8,7 @@ t = Test()
master = t.server("knot")
zones = t.zone("notexist.", exists=False) + t.zone("wild.")
zones = t.zone("notexist.", exists=False) + t.zone("example.com.")
t.link(zones, master)
......@@ -23,7 +23,7 @@ resp = master.dig("xfiles.", "SOA", udp=True)
resp.check(rcode="REFUSED")
# The other zone should answer without problem
resp = master.dig("wild.", "SOA", udp=True)
resp = master.dig("example.com.", "SOA", udp=True)
resp.check(rcode="NOERROR")
# Stop master.
......
......@@ -9,7 +9,7 @@ t = Test()
master = t.server("knot")
# Zone setup
zone = t.zone("example.com.", storage = ".")
zone = t.zone("example.com.", storage=".")
t.link(zone, master)
......
......@@ -10,9 +10,9 @@ t = Test()
master = t.server("knot")
# Zone setup
zone = t.zone("serial.", storage = ".")
zone = t.zone("serial.", storage=".")
t.link(zone, master, ixfr = True)
t.link(zone, master, ixfr=True)
t.start()
......@@ -31,7 +31,7 @@ def reload_zone(serial, version):
resp.check(rcode="NOERROR")
# Zone changes, serial increases (create changeset)
version = 1
version = 1
serial = serial + 1
reload_zone(serial, version)
......@@ -41,7 +41,7 @@ reload_zone(serial, version)
# Zone changes, serial jumps out-of-range (journal is not applicable)
version += 1
serial = serial - 2
serial = serial - 2
reload_zone(serial, version)
# Stop master.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment