Add skipping for nodyndns backends.

diff --git a/regression-tests/0dyndns-prereq-all/description b/regression-tests/0dyndns-prereq-all/description
index 577be11e29fe781192ecdec5dcd357c2177a767b..62edb5ff762e1cd7504c70b5937b846ed4930cf4 100755 (executable)
--- a/regression-tests/0dyndns-prereq-all/description
+++ b/regression-tests/0dyndns-prereq-all/description
@@ -1 +1,2 @@
 This test checks section 3.2.1 and 3.2.3 of RFC2136, which is the prerequisite section.
+This test also checks to see what happens when a backend does NOT support RFC2136. 

diff --git a/regression-tests/0dyndns-prereq-all/expected_result.narrow b/regression-tests/0dyndns-prereq-all/expected_result.narrow
deleted file mode 100644 (file)
index 3f07246..0000000
--- a/regression-tests/0dyndns-prereq-all/expected_result.narrow
+++ /dev/null
@@ -1,49 +0,0 @@
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='host-255.test.dyndns.', qtype=ANY
-Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NXDOMAIN ID_REPLACED
-;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
-;; ZONE SECTION:
-;test.dyndns.                  IN      SOA
-
-0      host-1.test.dyndns.     IN      A       3600    127.0.0.101
-0      tdhv9cbk13jg8drivldhsl3mji8qqqe2.test.dyndns.   IN      NSEC3   86400   1 1 1 abcd TDHV9CBK13JG8DRIVLDHSL3MJI8QQQE3 A RRSIG
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='host-1.test.dyndns.', qtype=ANY
-Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NXRRSET ID_REPLACED
-;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
-;; ZONE SECTION:
-;test.dyndns.                  IN      SOA
-
-0      host-1.test.dyndns.     IN      A       3600    127.0.0.101
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='host-1.test.dyndns.', qtype=A
-0      host-2.test.dyndns.     IN      A       3600    127.0.0.102
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='host-2.test.dyndns.', qtype=A
-Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: YXDOMAIN ID_REPLACED
-;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
-;; ZONE SECTION:
-;test.dyndns.                  IN      SOA
-
-0      host-2.test.dyndns.     IN      A       3600    127.0.0.102
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='host-2.test.dyndns.', qtype=A
-Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: YXRRSET ID_REPLACED
-;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
-;; ZONE SECTION:
-;test.dyndns.                  IN      SOA
-
-0      host-2.test.dyndns.     IN      A       3600    127.0.0.102
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='host-2.test.dyndns.', qtype=A
-Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NXDOMAIN ID_REPLACED
-;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
-;; ZONE SECTION:
-;test.dyndns.                  IN      SOA
-

diff --git a/regression-tests/0dyndns-prereq-all/skip.nodyndns b/regression-tests/0dyndns-prereq-all/skip.nodyndns
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/regression-tests/0dyndns-prereq-nxrrset-full/expected_result.narrow b/regression-tests/0dyndns-prereq-nxrrset-full/expected_result.narrow
deleted file mode 100644 (file)
index 41b6916..0000000
--- a/regression-tests/0dyndns-prereq-nxrrset-full/expected_result.narrow
+++ /dev/null
@@ -1,24 +0,0 @@
-0      multi.test.dyndns.      IN      A       3600    127.0.0.1
-0      multi.test.dyndns.      IN      A       3600    127.0.0.2
-0      multi.test.dyndns.      IN      A       3600    127.0.0.3
-0      tntcbdfsihhd24nt96bq9973vd019u43.test.dyndns.   IN      NSEC3   86400   1 1 1 abcd TNTCBDFSIHHD24NT96BQ9973VD019U44 A RRSIG
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='multi.test.dyndns.', qtype=ANY
-Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NXRRSET ID_REPLACED
-;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
-;; ZONE SECTION:
-;test.dyndns.                  IN      SOA
-
-Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
-;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
-;; ZONE SECTION:
-;test.dyndns.                  IN      SOA
-
-Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NXRRSET ID_REPLACED
-;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
-;; ZONE SECTION:
-;test.dyndns.                  IN      SOA
-

diff --git a/regression-tests/0dyndns-prereq-nxrrset-full/skip.nodyndns b/regression-tests/0dyndns-prereq-nxrrset-full/skip.nodyndns
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/regression-tests/1dyndns-update-add-delete-cname/skip.nodyndns b/regression-tests/1dyndns-update-add-delete-cname/skip.nodyndns
new file mode 100644 (file)
index 0000000..81c071b
--- /dev/null
+++ b/regression-tests/1dyndns-update-add-delete-cname/skip.nodyndns
@@ -0,0 +1 @@
+Skip this test if the backend does not support dyndns/rfc2136

diff --git a/regression-tests/1dyndns-update-add-delete-mx/skip.nodyndns b/regression-tests/1dyndns-update-add-delete-mx/skip.nodyndns
new file mode 100644 (file)
index 0000000..81c071b
--- /dev/null
+++ b/regression-tests/1dyndns-update-add-delete-mx/skip.nodyndns
@@ -0,0 +1 @@
+Skip this test if the backend does not support dyndns/rfc2136

diff --git a/regression-tests/1dyndns-update-add-delete-wildcard/skip.nodyndns b/regression-tests/1dyndns-update-add-delete-wildcard/skip.nodyndns
new file mode 100644 (file)
index 0000000..81c071b
--- /dev/null
+++ b/regression-tests/1dyndns-update-add-delete-wildcard/skip.nodyndns
@@ -0,0 +1 @@
+Skip this test if the backend does not support dyndns/rfc2136

diff --git a/regression-tests/1dyndns-update-add-delete/skip.nodyndns b/regression-tests/1dyndns-update-add-delete/skip.nodyndns
new file mode 100644 (file)
index 0000000..81c071b
--- /dev/null
+++ b/regression-tests/1dyndns-update-add-delete/skip.nodyndns
@@ -0,0 +1 @@
+Skip this test if the backend does not support dyndns/rfc2136

diff --git a/regression-tests/1dyndns-update-add-invalid-record/skip.nodyndns b/regression-tests/1dyndns-update-add-invalid-record/skip.nodyndns
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/regression-tests/1dyndns-update-add-soa/skip.nodyndns b/regression-tests/1dyndns-update-add-soa/skip.nodyndns
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/regression-tests/1dyndns-update-delegate-in-between/skip.nodyndns b/regression-tests/1dyndns-update-delegate-in-between/skip.nodyndns
new file mode 100644 (file)
index 0000000..81c071b
--- /dev/null
+++ b/regression-tests/1dyndns-update-delegate-in-between/skip.nodyndns
@@ -0,0 +1 @@
+Skip this test if the backend does not support dyndns/rfc2136

diff --git a/regression-tests/1dyndns-update-delegate/skip.nodyndns b/regression-tests/1dyndns-update-delegate/skip.nodyndns
new file mode 100644 (file)
index 0000000..81c071b
--- /dev/null
+++ b/regression-tests/1dyndns-update-delegate/skip.nodyndns
@@ -0,0 +1 @@
+Skip this test if the backend does not support dyndns/rfc2136

diff --git a/regression-tests/1dyndns-update-delete-add-host/skip.nodyndns b/regression-tests/1dyndns-update-delete-add-host/skip.nodyndns
new file mode 100644 (file)
index 0000000..81c071b
--- /dev/null
+++ b/regression-tests/1dyndns-update-delete-add-host/skip.nodyndns
@@ -0,0 +1 @@
+Skip this test if the backend does not support dyndns/rfc2136

diff --git a/regression-tests/1dyndns-update-delete-multi-add-host/skip.nodyndns b/regression-tests/1dyndns-update-delete-multi-add-host/skip.nodyndns
new file mode 100644 (file)
index 0000000..81c071b
--- /dev/null
+++ b/regression-tests/1dyndns-update-delete-multi-add-host/skip.nodyndns
@@ -0,0 +1 @@
+Skip this test if the backend does not support dyndns/rfc2136

diff --git a/regression-tests/1dyndns-update-delete-mx-prio/skip.nodyndns b/regression-tests/1dyndns-update-delete-mx-prio/skip.nodyndns
new file mode 100644 (file)
index 0000000..81c071b
--- /dev/null
+++ b/regression-tests/1dyndns-update-delete-mx-prio/skip.nodyndns
@@ -0,0 +1 @@
+Skip this test if the backend does not support dyndns/rfc2136

diff --git a/regression-tests/1dyndns-update-delete-ns/skip.nodyndns b/regression-tests/1dyndns-update-delete-ns/skip.nodyndns
new file mode 100644 (file)
index 0000000..81c071b
--- /dev/null
+++ b/regression-tests/1dyndns-update-delete-ns/skip.nodyndns
@@ -0,0 +1 @@
+Skip this test if the backend does not support dyndns/rfc2136

diff --git a/regression-tests/1dyndns-update-delete-soa/skip.nodyndns b/regression-tests/1dyndns-update-delete-soa/skip.nodyndns
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/regression-tests/1dyndns-update-in-between/skip.nodyndns b/regression-tests/1dyndns-update-in-between/skip.nodyndns
new file mode 100644 (file)
index 0000000..81c071b
--- /dev/null
+++ b/regression-tests/1dyndns-update-in-between/skip.nodyndns
@@ -0,0 +1 @@
+Skip this test if the backend does not support dyndns/rfc2136

diff --git a/regression-tests/1dyndns-update-replace-a-host/skip.nodyndns b/regression-tests/1dyndns-update-replace-a-host/skip.nodyndns
new file mode 100644 (file)
index 0000000..81c071b
--- /dev/null
+++ b/regression-tests/1dyndns-update-replace-a-host/skip.nodyndns
@@ -0,0 +1 @@
+Skip this test if the backend does not support dyndns/rfc2136

diff --git a/regression-tests/1dyndns-update-replace-cname/skip.nodyndns b/regression-tests/1dyndns-update-replace-cname/skip.nodyndns
new file mode 100644 (file)
index 0000000..81c071b
--- /dev/null
+++ b/regression-tests/1dyndns-update-replace-cname/skip.nodyndns
@@ -0,0 +1 @@
+Skip this test if the backend does not support dyndns/rfc2136

diff --git a/regression-tests/1dyndns-update-replace-mx/skip.nodyndns b/regression-tests/1dyndns-update-replace-mx/skip.nodyndns
new file mode 100644 (file)
index 0000000..81c071b
--- /dev/null
+++ b/regression-tests/1dyndns-update-replace-mx/skip.nodyndns
@@ -0,0 +1 @@
+Skip this test if the backend does not support dyndns/rfc2136

diff --git a/regression-tests/1dyndns-update-srv/skip.nodyndns b/regression-tests/1dyndns-update-srv/skip.nodyndns
new file mode 100644 (file)
index 0000000..81c071b
--- /dev/null
+++ b/regression-tests/1dyndns-update-srv/skip.nodyndns
@@ -0,0 +1 @@
+Skip this test if the backend does not support dyndns/rfc2136

diff --git a/regression-tests/1dyndns-update-update-ttl/skip.nodyndns b/regression-tests/1dyndns-update-update-ttl/skip.nodyndns
new file mode 100644 (file)
index 0000000..81c071b
--- /dev/null
+++ b/regression-tests/1dyndns-update-update-ttl/skip.nodyndns
@@ -0,0 +1 @@
+Skip this test if the backend does not support dyndns/rfc2136

diff --git a/regression-tests/2dyndns-update-replace-soa/skip.nodyndns b/regression-tests/2dyndns-update-replace-soa/skip.nodyndns
new file mode 100644 (file)
index 0000000..81c071b
--- /dev/null
+++ b/regression-tests/2dyndns-update-replace-soa/skip.nodyndns
@@ -0,0 +1 @@
+Skip this test if the backend does not support dyndns/rfc2136

diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop
index 5b6edc94c96afcf7e6556f5b3956700698de0043..0fb03ee216a8fd638b6fa3367f2645199f10c01e 100755 (executable)
--- a/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@ -124,7 +124,7 @@ case $context in
                                --send-root-referral    \
                                --allow-2136-from=127.0.0.0/8 --disable-rfc2136=no \
                                --cache-ttl=$cachettl --no-config &
-                       skipreasons=nodnssec
+                       skipreasons="nodnssec nodyndns"
                        bindwait
                        ;;
 
@@ -146,17 +146,18 @@ case $context in
                        if [ $context = bind-dnssec-nsec3 ]
                        then
                                extracontexts="bind dnssec nsec3"
-                               skipreasons="nsec3"
+                               skipreasons="nsec3 nodyndns"
                        elif [ $context = bind-dnssec-nsec3-optout ]
                        then
                                extracontexts="bind dnssec nsec3 nsec3-optout"
-                               skipreasons="optout"
+                               skipreasons="optout nodyndns"
                        elif [ $context = bind-dnssec-nsec3-narrow ]
                        then
                                extracontexts="bind dnssec narrow"
-                               skipreasons="narrow"
+                               skipreasons="narrow nodyndns"
                        else
                                extracontexts="bind dnssec"
+                               skipreasons="nodyndns"
                        fi
 
                        $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \
@@ -238,7 +239,7 @@ __EOF__
                                --mydns-user="$MYDNSUSER" \
                                --mydns-host="$MYDNSHOST" \
                                --mydns-password="$MYDNSPASSWD" &
-                       skipreasons="nodnssec noent"
+                       skipreasons="nodnssec noent nodyndns"
                        ;;
 
                gmysql | gmysql-nsec3 | gmysql-nsec3-optout |gmysql-nsec3-narrow)
@@ -426,7 +427,7 @@ __EOF__
                                --cache-ttl=$cachettl --no-config \
                                --opendbx-backend=sqlite3 --opendbx-host-read=./ --opendbx-host-write=./ \
                                --opendbx-database=pdns-opendbx.sqlite3 &
-                       skipreasons="nodnssec noent"
+                       skipreasons="nodnssec noent nodyndns"
 
                        ;;                                                                      
                gsqlite3 | gsqlite3-nsec3 | gsqlite3-nsec3-optout)
@@ -474,7 +475,7 @@ __EOF__
                                --send-root-referral \
                                --allow-2136-from=127.0.0.0/8 --disable-rfc2136=no \
                                --tinydns-dbfile=../modules/tinydnsbackend/data.cdb & 
-                       skipreasons="nodnssec noent"
+                       skipreasons="nodnssec noent nodyndns"
                        ;;
                remotebackend-*)
                        remotetype=$(echo $context | cut -d- -f 2)
@@ -515,16 +516,16 @@ __EOF__
                                ;;
                        esac
 
-                       skipreasons="nodnssec"
+                       skipreasons="nodnssec nodyndns"
 
                        if [ "$remotesec" = "nsec3" ]; then
                                remotedosec="yes"
                                if [ "$narrow" = "narrow" ]; then
                                        extracontexts="dnssec nsec3 narrow"
-                                       skipreasons="narrow nsec3"
+                                       skipreasons="narrow nsec3 nodyndns"
                                else 
                                        extracontexts="dnssec nsec3"
-                                       skipreasons="nsec3"
+                                       skipreasons="nsec3 nodyndns"
                                fi
                                remote_add_param="--remote-dnssec=yes"
                         else 
@@ -532,7 +533,7 @@ __EOF__
                                        remotedosec="yes"
                                        remote_add_param="--remote-dnssec=yes"
                                        extracontexts="dnssec"
-                                       skipreasons="nonsec3 nonarrow"
+                                       skipreasons="nonsec3 nonarrow nodyndns"
                                fi
                        fi