From ba157ade970e838caa6e6d19db8d4a7771d60e3c Mon Sep 17 00:00:00 2001 From: Robin Geuze Date: Thu, 6 Feb 2020 12:30:38 +0100 Subject: [PATCH] Add AXFR to the default-publish-cds tests --- .../default-publish-cds/command | 4 ++ .../default-publish-cds/expected_result | 46 +++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/regression-tests.nobackend/default-publish-cds/command b/regression-tests.nobackend/default-publish-cds/command index 48a855dca1..61f4873208 100755 --- a/regression-tests.nobackend/default-publish-cds/command +++ b/regression-tests.nobackend/default-publish-cds/command @@ -35,12 +35,16 @@ $PDNS --config-dir=default-publish-cds & bindwait $SDIG 127.0.0.1 $port minimal.com CDS dnssec | LC_ALL=C sort +$SAXFR 127.0.0.1 $port minimal.com dnssec | LC_ALL=C sort $PDNSUTIL --config-dir=default-publish-cds set-publish-cds minimal.com 2 $SDIG 127.0.0.1 $port minimal.com CDS dnssec | LC_ALL=C sort +$SAXFR 127.0.0.1 $port minimal.com dnssec | LC_ALL=C sort $PDNSUTIL --config-dir=default-publish-cds set-publish-cds minimal.com '' $SDIG 127.0.0.1 $port minimal.com CDS dnssec | LC_ALL=C sort +$SAXFR 127.0.0.1 $port minimal.com dnssec | LC_ALL=C sort $PDNSUTIL --config-dir=default-publish-cds unset-publish-cds minimal.com $SDIG 127.0.0.1 $port minimal.com CDS dnssec | LC_ALL=C sort +$SAXFR 127.0.0.1 $port minimal.com dnssec | LC_ALL=C sort kill $(cat pdns*.pid) rm pdns*.pid diff --git a/regression-tests.nobackend/default-publish-cds/expected_result b/regression-tests.nobackend/default-publish-cds/expected_result index b19155390b..25d3c383ef 100644 --- a/regression-tests.nobackend/default-publish-cds/expected_result +++ b/regression-tests.nobackend/default-publish-cds/expected_result @@ -4,11 +4,35 @@ 2 . IN OPT 32768 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 Reply to question for qname='minimal.com.', qtype=CDS +minimal.com. 120 IN NS ns1.example.com. +minimal.com. 120 IN NS ns2.example.com. +minimal.com. 120 IN RRSIG NS 8 2 120 [expiry] [inception] [keytag] minimal.com. ... +minimal.com. 120 IN RRSIG SOA 8 2 120 [expiry] [inception] [keytag] minimal.com. ... +minimal.com. 120 IN SOA ns1.example.com. ahu.example.com. 2000081501 28800 7200 604800 86400 +minimal.com. 120 IN SOA ns1.example.com. ahu.example.com. 2000081501 28800 7200 604800 86400 +minimal.com. 86400 IN CDS 54319 8 4 ff159f2cc251c9850b24bedb9158f33b292137d228a2a8686c2a178e29e1097f80210813beba035bb065bbe1ffbb2229 +minimal.com. 86400 IN DNSKEY 257 3 8 ... +minimal.com. 86400 IN NSEC minimal.com. NS SOA RRSIG NSEC DNSKEY CDS +minimal.com. 86400 IN RRSIG CDS 8 2 86400 [expiry] [inception] [keytag] minimal.com. ... +minimal.com. 86400 IN RRSIG DNSKEY 8 2 86400 [expiry] [inception] [keytag] minimal.com. ... +minimal.com. 86400 IN RRSIG NSEC 8 2 86400 [expiry] [inception] [keytag] minimal.com. ... 0 minimal.com. IN CDS 86400 54319 8 2 c5359d2a312ff6c28883b5d6404c76666262c26bd3dadfed63afb366e6f09c24 0 minimal.com. IN RRSIG 86400 CDS 8 2 86400 [expiry] [inception] [keytag] minimal.com. ... 2 . IN OPT 32768 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 Reply to question for qname='minimal.com.', qtype=CDS +minimal.com. 120 IN NS ns1.example.com. +minimal.com. 120 IN NS ns2.example.com. +minimal.com. 120 IN RRSIG NS 8 2 120 [expiry] [inception] [keytag] minimal.com. ... +minimal.com. 120 IN RRSIG SOA 8 2 120 [expiry] [inception] [keytag] minimal.com. ... +minimal.com. 120 IN SOA ns1.example.com. ahu.example.com. 2000081501 28800 7200 604800 86400 +minimal.com. 120 IN SOA ns1.example.com. ahu.example.com. 2000081501 28800 7200 604800 86400 +minimal.com. 86400 IN CDS 54319 8 2 c5359d2a312ff6c28883b5d6404c76666262c26bd3dadfed63afb366e6f09c24 +minimal.com. 86400 IN DNSKEY 257 3 8 ... +minimal.com. 86400 IN NSEC minimal.com. NS SOA RRSIG NSEC DNSKEY CDS +minimal.com. 86400 IN RRSIG CDS 8 2 86400 [expiry] [inception] [keytag] minimal.com. ... +minimal.com. 86400 IN RRSIG DNSKEY 8 2 86400 [expiry] [inception] [keytag] minimal.com. ... +minimal.com. 86400 IN RRSIG NSEC 8 2 86400 [expiry] [inception] [keytag] minimal.com. ... 1 minimal.com. IN NSEC 86400 minimal.com. NS SOA RRSIG NSEC DNSKEY 1 minimal.com. IN RRSIG 120 SOA 8 2 120 [expiry] [inception] [keytag] minimal.com. ... 1 minimal.com. IN RRSIG 86400 NSEC 8 2 86400 [expiry] [inception] [keytag] minimal.com. ... @@ -16,8 +40,30 @@ Reply to question for qname='minimal.com.', qtype=CDS 2 . IN OPT 32768 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 Reply to question for qname='minimal.com.', qtype=CDS +minimal.com. 120 IN NS ns1.example.com. +minimal.com. 120 IN NS ns2.example.com. +minimal.com. 120 IN RRSIG NS 8 2 120 [expiry] [inception] [keytag] minimal.com. ... +minimal.com. 120 IN RRSIG SOA 8 2 120 [expiry] [inception] [keytag] minimal.com. ... +minimal.com. 120 IN SOA ns1.example.com. ahu.example.com. 2000081501 28800 7200 604800 86400 +minimal.com. 120 IN SOA ns1.example.com. ahu.example.com. 2000081501 28800 7200 604800 86400 +minimal.com. 86400 IN DNSKEY 257 3 8 ... +minimal.com. 86400 IN NSEC minimal.com. NS SOA RRSIG NSEC DNSKEY +minimal.com. 86400 IN RRSIG DNSKEY 8 2 86400 [expiry] [inception] [keytag] minimal.com. ... +minimal.com. 86400 IN RRSIG NSEC 8 2 86400 [expiry] [inception] [keytag] minimal.com. ... 0 minimal.com. IN CDS 86400 54319 8 4 ff159f2cc251c9850b24bedb9158f33b292137d228a2a8686c2a178e29e1097f80210813beba035bb065bbe1ffbb2229 0 minimal.com. IN RRSIG 86400 CDS 8 2 86400 [expiry] [inception] [keytag] minimal.com. ... 2 . IN OPT 32768 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 Reply to question for qname='minimal.com.', qtype=CDS +minimal.com. 120 IN NS ns1.example.com. +minimal.com. 120 IN NS ns2.example.com. +minimal.com. 120 IN RRSIG NS 8 2 120 [expiry] [inception] [keytag] minimal.com. ... +minimal.com. 120 IN RRSIG SOA 8 2 120 [expiry] [inception] [keytag] minimal.com. ... +minimal.com. 120 IN SOA ns1.example.com. ahu.example.com. 2000081501 28800 7200 604800 86400 +minimal.com. 120 IN SOA ns1.example.com. ahu.example.com. 2000081501 28800 7200 604800 86400 +minimal.com. 86400 IN CDS 54319 8 4 ff159f2cc251c9850b24bedb9158f33b292137d228a2a8686c2a178e29e1097f80210813beba035bb065bbe1ffbb2229 +minimal.com. 86400 IN DNSKEY 257 3 8 ... +minimal.com. 86400 IN NSEC minimal.com. NS SOA RRSIG NSEC DNSKEY CDS +minimal.com. 86400 IN RRSIG CDS 8 2 86400 [expiry] [inception] [keytag] minimal.com. ... +minimal.com. 86400 IN RRSIG DNSKEY 8 2 86400 [expiry] [inception] [keytag] minimal.com. ... +minimal.com. 86400 IN RRSIG NSEC 8 2 86400 [expiry] [inception] [keytag] minimal.com. ... -- 2.47.2