From: Ruben d'Arco <cyclops@prof-x.net>
Date: Mon, 20 May 2013 22:20:21 +0000 (+0200)
Subject: Hidesoadetails for deep-delegate test
X-Git-Tag: rec-3.6.0-rc1~556^2~3^2~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=01860d395c6fb85b719293ae60cc5af42f9070ec;p=thirdparty%2Fpdns.git

Hidesoadetails for deep-delegate test
---

diff --git a/regression-tests/1dyndns-update-deep-delegate/command b/regression-tests/1dyndns-update-deep-delegate/command
index 4781008bae..0ca6eb2cfb 100755
--- 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 c2abcc33a0..8b621d959c 100644
--- 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 a29481f7d5..ff06a02b3e 100644
--- 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 57e5d41dd9..e920f22134 100644
--- 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 a42c96e2fe..7b39fca520 100644
--- 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
index 0000000000..e920f22134
--- /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 ---
+