Fix checkzone 'cname and other data' tests

* Fix path name pattern for 'cname and other data' tests.
* Fix errors in test files for AFSDB, OPENGPG and SMIMEA.
* Add test files for DSYNC, HHIT and BRID.
* Use TYPE69 for unknown type now the DSYNC (66) has been allocated.

diff --git a/bin/tests/system/checkzone/tests.sh b/bin/tests/system/checkzone/tests.sh
index 0806392d928086db0bb33850839f9115e9e686fe..e01807256e2d6c22cb2e37d072371cb36ef9df89 100644 (file)
--- a/bin/tests/system/checkzone/tests.sh
+++ b/bin/tests/system/checkzone/tests.sh
@@ -47,7 +47,7 @@ for db in zones/bad*.db; do
     zones/bad-dns-sd-reverse.db | zones/bad-svcb-servername.db)
       $CHECKZONE -k fail -i local 0.0.0.0.in-addr.arpa $db >test.out.$n 2>&1 || v=$?
       ;;
-    bad-cname-and*.db)
+    zones/bad-cname-and*.db)
       $CHECKZONE -i local example $db >test.out.$n 2>&1 || v=$?
       grep "CNAME and other data" test.out.$n >/dev/null || ret=1
       ;;

diff --git a/bin/tests/system/checkzone/zones/bad-cname-and-afsdb.db b/bin/tests/system/checkzone/zones/bad-cname-and-afsdb.db
index 78072521e33d09d9e41ef1d14a34acd00816170a..51424dc19797e3c2e73ecfc58a1a345b25d00492 100644 (file)
--- a/bin/tests/system/checkzone/zones/bad-cname-and-afsdb.db
+++ b/bin/tests/system/checkzone/zones/bad-cname-and-afsdb.db
@@ -2,5 +2,5 @@ $TTL 600
 @              SOA     ns hostmaster 2011012708 3600 1200 604800 1200
                NS      ns
 ns             A       192.0.2.1
-bad            BAD     65535 .
+bad            AFSDB   65535 .
 bad            CNAME   @

diff --git a/bin/tests/system/checkzone/zones/bad-cname-and-type66.db b/bin/tests/system/checkzone/zones/bad-cname-and-brid.db
similarity index 83%
rename from bin/tests/system/checkzone/zones/bad-cname-and-type66.db
rename to bin/tests/system/checkzone/zones/bad-cname-and-brid.db
index 82c8dd8e6bae94de72a99a539ae40443ad6100ee..bf21c408aeec004af924e9142f16173bf887eac5 100644 (file)
--- a/bin/tests/system/checkzone/zones/bad-cname-and-type66.db
+++ b/bin/tests/system/checkzone/zones/bad-cname-and-brid.db
@@ -2,5 +2,5 @@ $TTL 600
 @              SOA     ns hostmaster 2011012708 3600 1200 604800 1200
                NS      ns
 ns             A       192.0.2.1
-bad            TYPE66  \# 1 00
+bad            BRID    abcd
 bad            CNAME   @

diff --git a/bin/tests/system/checkzone/zones/bad-cname-and-dsync.db b/bin/tests/system/checkzone/zones/bad-cname-and-dsync.db
new file mode 100644 (file)
index 0000000..54edef2
--- /dev/null
+++ b/bin/tests/system/checkzone/zones/bad-cname-and-dsync.db
@@ -0,0 +1,6 @@
+$TTL 600
+@              SOA     ns hostmaster 2011012708 3600 1200 604800 1200
+               NS      ns
+ns             A       192.0.2.1
+bad            DSYNC   CDS NOTIFY 1000 scanner1
+bad            CNAME   @

diff --git a/bin/tests/system/checkzone/zones/bad-cname-and-hhit.db b/bin/tests/system/checkzone/zones/bad-cname-and-hhit.db
new file mode 100644 (file)
index 0000000..3362361
--- /dev/null
+++ b/bin/tests/system/checkzone/zones/bad-cname-and-hhit.db
@@ -0,0 +1,6 @@
+$TTL 600
+@              SOA     ns hostmaster 2011012708 3600 1200 604800 1200
+               NS      ns
+ns             A       192.0.2.1
+bad            HHIT    abcd
+bad            CNAME   @

diff --git a/bin/tests/system/checkzone/zones/bad-cname-and-opengpgkey.db b/bin/tests/system/checkzone/zones/bad-cname-and-openpgpkey.db
similarity index 83%
rename from bin/tests/system/checkzone/zones/bad-cname-and-opengpgkey.db
rename to bin/tests/system/checkzone/zones/bad-cname-and-openpgpkey.db
index 3af5adefaf7dc1e0fd7356786037d005f758ab3d..8901e9a7c099ee3013df09cc9efa9999ae2461bd 100644 (file)
--- a/bin/tests/system/checkzone/zones/bad-cname-and-opengpgkey.db
+++ b/bin/tests/system/checkzone/zones/bad-cname-and-openpgpkey.db
@@ -2,7 +2,7 @@ $TTL 600
 @              SOA     ns hostmaster 2011012708 3600 1200 604800 1200
                NS      ns
 ns             A       192.0.2.1
-bad            OPENGPGKEY      ( AQMFD5raczCJHViKtLYhWGz8hMY
+bad            OPENPGPKEY      ( AQMFD5raczCJHViKtLYhWGz8hMY
                        9UGRuniJDBzC7w0aRyzWZriO6i2odGWWQVucZqKV
                        sENW91IOW4vqudngPZsY3GvQ/xVA8/7pyFj6b7Esg
                        a60zyGW6LFe9r8n6paHrlG5ojqf0BaqHT+8= )

diff --git a/bin/tests/system/checkzone/zones/bad-cname-and-smimea.db b/bin/tests/system/checkzone/zones/bad-cname-and-smimea.db
index f1715f553039326c8003e41b75d537dd9fe7a720..0c3af46d82296ca136c98690b39dfcaa509d883c 100644 (file)
--- a/bin/tests/system/checkzone/zones/bad-cname-and-smimea.db
+++ b/bin/tests/system/checkzone/zones/bad-cname-and-smimea.db
@@ -2,7 +2,7 @@ $TTL 600
 @              SOA     ns hostmaster 2011012708 3600 1200 604800 1200
                NS      ns
 ns             A       192.0.2.1
-bad            SMIMES  ( 1 1 2 92003ba34942dc74152e2f2c408d29ec
+bad            SMIMEA  ( 1 1 2 92003ba34942dc74152e2f2c408d29ec
                        a5a520e7f2e06bb944f4dca346baf63c
                        1b177615d466f6c4b71c216a50292bd5
                        8c9ebdd2f74e38fe51ffd48c43326cbc )

diff --git a/bin/tests/system/checkzone/zones/bad-cname-and-type69.db b/bin/tests/system/checkzone/zones/bad-cname-and-type69.db
new file mode 100644 (file)
index 0000000..6d30321
--- /dev/null
+++ b/bin/tests/system/checkzone/zones/bad-cname-and-type69.db
@@ -0,0 +1,6 @@
+$TTL 600
+@              SOA     ns hostmaster 2011012708 3600 1200 604800 1200
+               NS      ns
+ns             A       192.0.2.1
+bad            TYPE69  \# 1 00
+bad            CNAME   @