Hidesoadetails for deep-delegate test

diff --git a/regression-tests/1dyndns-update-deep-delegate/command b/regression-tests/1dyndns-update-deep-delegate/command
index 4781008bae3fd4809aaaa7248ce56bf75917a750..0ca6eb2cfb7dacc5f268eb748121f5a6ff9420f6 100755 (executable)
--- a/regression-tests/1dyndns-update-deep-delegate/command
+++ b/regression-tests/1dyndns-update-deep-delegate/command
@@ -14,8 +14,8 @@ send
 answer
 !
 
-cleandig delegate.test.dyndns ANY
-cleandig other.very.deep.delegate.test.dyndns
+cleandig delegate.test.dyndns ANY hidesoadetails
+cleandig other.very.deep.delegate.test.dyndns hidesoadetails
 mysqldiff 1 "Check delegates added"
 
 cleannsupdate <<!
@@ -29,6 +29,6 @@ send
 answer
 !
 
-cleandig delegate.test.dyndns ANY
-cleandig other.very.deep.delegate.test.dyndns
+cleandig delegate.test.dyndns ANY hidesoadetails
+cleandig other.very.deep.delegate.test.dyndns hidesoadetails
 mysqldiff 2 "Check delegates deleted"
\ No newline at end of file

diff --git a/regression-tests/1dyndns-update-deep-delegate/expected_result b/regression-tests/1dyndns-update-deep-delegate/expected_result
index c2abcc33a036504a76b3c93ba5f8427176203a04..8b621d959c9c34c1375bb77bbeff2f90d27c812f 100644 (file)
--- a/regression-tests/1dyndns-update-deep-delegate/expected_result
+++ b/regression-tests/1dyndns-update-deep-delegate/expected_result
@@ -25,7 +25,7 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. 2013051902 28800 7200 604800 86400
+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='delegate.test.dyndns.', qtype=ANY
 Check delegates deleted

diff --git a/regression-tests/1dyndns-update-deep-delegate/expected_result.dnssec b/regression-tests/1dyndns-update-deep-delegate/expected_result.dnssec
index a29481f7d544e36521805efa47130a94b2602441..ff06a02b3ed67e216650822b5374f38bc7446e5b 100644 (file)
--- a/regression-tests/1dyndns-update-deep-delegate/expected_result.dnssec
+++ b/regression-tests/1dyndns-update-deep-delegate/expected_result.dnssec
@@ -25,7 +25,7 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. 2013051902 28800 7200 604800 86400
+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='delegate.test.dyndns.', qtype=ANY
 Check delegates deleted

diff --git a/regression-tests/1dyndns-update-deep-delegate/expected_result.narrow b/regression-tests/1dyndns-update-deep-delegate/expected_result.narrow
index 57e5d41dd978e9e50843c1db43d196e4781387eb..e920f22134d0845af2dc3b0d8c4c17bc045636f5 100644 (file)
--- a/regression-tests/1dyndns-update-deep-delegate/expected_result.narrow
+++ b/regression-tests/1dyndns-update-deep-delegate/expected_result.narrow
@@ -25,7 +25,7 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. 2013051902 28800 7200 604800 86400
+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='delegate.test.dyndns.', qtype=ANY
 Check delegates deleted

diff --git a/regression-tests/1dyndns-update-deep-delegate/expected_result.nsec3 b/regression-tests/1dyndns-update-deep-delegate/expected_result.nsec3
index a42c96e2fe00bfdb6a94f87ecebb1ea0afcf0731..7b39fca520f14271139aa55f98ddfadb52766638 100644 (file)
--- a/regression-tests/1dyndns-update-deep-delegate/expected_result.nsec3
+++ b/regression-tests/1dyndns-update-deep-delegate/expected_result.nsec3
@@ -25,7 +25,7 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. 2013051902 28800 7200 604800 86400
+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='delegate.test.dyndns.', qtype=ANY
 Check delegates deleted

diff --git a/regression-tests/1dyndns-update-deep-delegate/expected_result.nsec3-optout b/regression-tests/1dyndns-update-deep-delegate/expected_result.nsec3-optout
new file mode 100644 (file)
index 0000000..e920f22
--- /dev/null
+++ b/regression-tests/1dyndns-update-deep-delegate/expected_result.nsec3-optout
@@ -0,0 +1,35 @@
+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='delegate1.test.dyndns.', qtype=ANY
+Answer:
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
+;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
+;; ZONE SECTION:
+;test.dyndns.                  IN      SOA
+
+1      delegate.test.dyndns.   IN      NS      3600    ns1.delegate.test.dyndns.
+2      ns1.delegate.test.dyndns.       IN      A       3600    127.0.0.1
+Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
+Reply to question for qname='delegate.test.dyndns.', qtype=ANY
+Check delegates added
+--- Start: diff start step.1 ---
+> delegate.test.dyndns NS      0       ns1.delegate.test.dyndns        3600    NULL    0
+> ns1.delegate.test.dyndns     A       0       127.0.0.1       3600    NULL    0
+> ns1.other.very.deep.delegate.test.dyndns     A       0       127.0.0.1       3600    NULL    0
+> other.very.deep.delegate.test.dyndns NS      0       ns1.other.very.deep.delegate.test.dyndns        3600    NULL    0
+--- End: diff start step.1 ---
+
+Answer:
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
+;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
+;; ZONE SECTION:
+;test.dyndns.                  IN      SOA
+
+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='delegate.test.dyndns.', qtype=ANY
+Check delegates deleted
+--- Start: diff start step.2 ---
+no difference
+--- End: diff start step.2 ---
+