regression tests update

diff --git a/regression-tests/basic-nonzone/command b/regression-tests/basic-nonzone/command
index 3f03a97a8e0872a867942294673d742f454bef47..98331900df9ed65ea4b9e9e405de844237441167 100755 (executable)
--- a/regression-tests/basic-nonzone/command
+++ b/regression-tests/basic-nonzone/command
@@ -1,4 +1,4 @@
 #!/bin/sh
-cleandig nonzone.com A
-cleandig testnonzone.com A
+cleandig nztest.com A
+cleandig testnz.com A | tail -n2
 

diff --git a/regression-tests/basic-nonzone/description b/regression-tests/basic-nonzone/description
index 51497ac48e2a37a8e1243d854da726e75f7df3cf..180a4afaa87fae1a11928b723cb57a538c6bbcda 100644 (file)
--- a/regression-tests/basic-nonzone/description
+++ b/regression-tests/basic-nonzone/description
@@ -1,2 +1,2 @@
-This test tries to resolve a straight A record that is directly available in
-the database.
+This test tries to resolve a straight A record from zone that contains
+non-zone data.

diff --git a/regression-tests/basic-nonzone/expected_result b/regression-tests/basic-nonzone/expected_result
index 84ba94302cf61e648bccd191d1544fd74c91b469..81414c6f7c0223049cf258ed03872f525ad5af9e 100644 (file)
--- a/regression-tests/basic-nonzone/expected_result
+++ b/regression-tests/basic-nonzone/expected_result
@@ -1,31 +1,5 @@
-0      nonzone.com.    IN      A       3600    127.0.0.1
+0      nztest.com.     IN      A       3600    127.0.0.1
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='nonzone.com.', qtype=A
-1      .       IN      NS      518400  a.root-servers.net.
-1      .       IN      NS      518400  b.root-servers.net.
-1      .       IN      NS      518400  c.root-servers.net.
-1      .       IN      NS      518400  d.root-servers.net.
-1      .       IN      NS      518400  e.root-servers.net.
-1      .       IN      NS      518400  f.root-servers.net.
-1      .       IN      NS      518400  g.root-servers.net.
-1      .       IN      NS      518400  h.root-servers.net.
-1      .       IN      NS      518400  i.root-servers.net.
-1      .       IN      NS      518400  j.root-servers.net.
-1      .       IN      NS      518400  k.root-servers.net.
-1      .       IN      NS      518400  l.root-servers.net.
-1      .       IN      NS      518400  m.root-servers.net.
-2      a.root-servers.net.     IN      A       3600000 198.41.0.4
-2      b.root-servers.net.     IN      A       3600000 192.228.79.201
-2      c.root-servers.net.     IN      A       3600000 192.33.4.12
-2      d.root-servers.net.     IN      A       3600000 199.7.91.13
-2      e.root-servers.net.     IN      A       3600000 192.203.230.10
-2      f.root-servers.net.     IN      A       3600000 192.5.5.241
-2      g.root-servers.net.     IN      A       3600000 192.112.36.4
-2      h.root-servers.net.     IN      A       3600000 128.63.2.53
-2      i.root-servers.net.     IN      A       3600000 192.36.148.17
-2      j.root-servers.net.     IN      A       3600000 192.58.128.30
-2      k.root-servers.net.     IN      A       3600000 193.0.14.129
-2      l.root-servers.net.     IN      A       3600000 198.32.64.12
-2      m.root-servers.net.     IN      A       3600000 202.12.27.33
+Reply to question for qname='nztest.com.', qtype=A
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
-Reply to question for qname='testnonzone.com.', qtype=A
+Reply to question for qname='testnz.com.', qtype=A

diff --git a/regression-tests/named.conf b/regression-tests/named.conf
index 31cd619fae4a67897151bbe658ecc8f378cafed5..8fc315b5fbafa0d0158302b6284d13b6f27f2c31 100644 (file)
--- a/regression-tests/named.conf
+++ b/regression-tests/named.conf
@@ -30,9 +30,9 @@ zone "wtest.com"{
        file "./wtest.com";
 };
 
-zone "nonzone.com"{
+zone "nztest.com"{
        type master;
-       file "./nonzone.com";
+       file "./nztest.com";
 };
 
 

diff --git a/regression-tests/nonzone.com b/regression-tests/nztest.com
similarity index 75%
rename from regression-tests/nonzone.com
rename to regression-tests/nztest.com
index 54459e39178b2298d27f0ed7a8ab5cfbe764f7f6..f5e9e69e31308a1460963165f59b8510ca61782d 100644 (file)
--- a/regression-tests/nonzone.com
+++ b/regression-tests/nztest.com
@@ -1,6 +1,6 @@
 $TTL 3600
-$ORIGIN nonzone.com.
-@              IN      SOA     ns1.nonzone.com.        ahu.example.com. (  2005092501
+$ORIGIN nztest.com.
+@              IN      SOA     ns1.nztest.com. ahu.example.com. (  2005092501
                        8H ; refresh
                        2H ; retry
                        1W ; expire