From f28e6380cb99d9b01f8dfbd9ef7b89af01fa9534 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Thu, 8 Nov 2012 08:29:41 +0000 Subject: [PATCH] add test for axfr dedup fix in r2856 git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2861 d19b8d6e-7fed-0310-83ef-9ca221ded41b --- regression-tests/any-nxdomain/expected_result.dnssec | 2 +- regression-tests/cname-to-nxdomain/expected_result.dnssec | 2 +- regression-tests/double/command | 2 ++ regression-tests/double/description | 1 + regression-tests/double/expected_result | 4 ++++ regression-tests/double/expected_result.dnssec | 5 +++++ regression-tests/example.com | 4 ++++ regression-tests/nsec-glue/expected_result | 2 +- regression-tests/nsec-middle/expected_result | 2 +- regression-tests/nsec-wraparound/expected_result | 2 +- regression-tests/nsec-wrong-type-at-apex/expected_result | 2 +- .../nxdomain-below-nonempty-terminal/expected_result | 2 +- regression-tests/second-level-nxdomain/expected_result | 2 +- regression-tests/two-level-nxdomain/expected_result | 2 +- 14 files changed, 25 insertions(+), 9 deletions(-) create mode 100755 regression-tests/double/command create mode 100644 regression-tests/double/description create mode 100644 regression-tests/double/expected_result create mode 100644 regression-tests/double/expected_result.dnssec diff --git a/regression-tests/any-nxdomain/expected_result.dnssec b/regression-tests/any-nxdomain/expected_result.dnssec index 4d714e5db..724e90f99 100644 --- a/regression-tests/any-nxdomain/expected_result.dnssec +++ b/regression-tests/any-nxdomain/expected_result.dnssec @@ -1,4 +1,4 @@ -1 example.com. IN NSEC 86400 dsdelegation.example.com. NS SOA MX RRSIG NSEC DNSKEY +1 example.com. IN NSEC 86400 double.example.com. NS SOA MX RRSIG NSEC DNSKEY 1 example.com. IN RRSIG 86400 NSEC 8 2 86400 [expiry] [inception] [keytag] example.com. ... 1 example.com. IN RRSIG 86400 SOA 8 2 100000 [expiry] [inception] [keytag] example.com. ... 1 example.com. IN SOA 86400 ns1.example.com. ahu.example.com. 2000081501 28800 7200 604800 86400 diff --git a/regression-tests/cname-to-nxdomain/expected_result.dnssec b/regression-tests/cname-to-nxdomain/expected_result.dnssec index 1978b08e7..d94ceb7bb 100644 --- a/regression-tests/cname-to-nxdomain/expected_result.dnssec +++ b/regression-tests/cname-to-nxdomain/expected_result.dnssec @@ -1,6 +1,6 @@ 0 nxd.example.com. IN CNAME 120 nxdomain.example.com. 0 nxd.example.com. IN RRSIG 120 CNAME 8 3 120 [expiry] [inception] [keytag] example.com. ... -1 example.com. IN NSEC 86400 dsdelegation.example.com. NS SOA MX RRSIG NSEC DNSKEY +1 example.com. IN NSEC 86400 double.example.com. NS SOA MX RRSIG NSEC DNSKEY 1 example.com. IN RRSIG 86400 NSEC 8 2 86400 [expiry] [inception] [keytag] example.com. ... 1 example.com. IN RRSIG 86400 SOA 8 2 100000 [expiry] [inception] [keytag] example.com. ... 1 example.com. IN SOA 86400 ns1.example.com. ahu.example.com. 2000081501 28800 7200 604800 86400 diff --git a/regression-tests/double/command b/regression-tests/double/command new file mode 100755 index 000000000..d4746cf1e --- /dev/null +++ b/regression-tests/double/command @@ -0,0 +1,2 @@ +#!/bin/sh +cleandig double.example.com A dnssec diff --git a/regression-tests/double/description b/regression-tests/double/description new file mode 100644 index 000000000..de127e320 --- /dev/null +++ b/regression-tests/double/description @@ -0,0 +1 @@ +Verify that we deduplicate records correctly for RRSIG generation. diff --git a/regression-tests/double/expected_result b/regression-tests/double/expected_result new file mode 100644 index 000000000..18cc4c188 --- /dev/null +++ b/regression-tests/double/expected_result @@ -0,0 +1,4 @@ +0 double.example.com. IN A 120 192.168.5.1 +2 . IN OPT 32768 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='double.example.com.', qtype=A diff --git a/regression-tests/double/expected_result.dnssec b/regression-tests/double/expected_result.dnssec new file mode 100644 index 000000000..5e027ce49 --- /dev/null +++ b/regression-tests/double/expected_result.dnssec @@ -0,0 +1,5 @@ +0 double.example.com. IN A 120 192.168.5.1 +0 double.example.com. IN RRSIG 120 A 8 3 120 [expiry] [inception] [keytag] example.com. ... +2 . IN OPT 32768 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='double.example.com.', qtype=A diff --git a/regression-tests/example.com b/regression-tests/example.com index f45edd2f2..32cfed936 100644 --- a/regression-tests/example.com +++ b/regression-tests/example.com @@ -17,6 +17,8 @@ $ORIGIN example.com. ns1 IN A 192.168.1.1 ns2 IN A 192.168.1.2 ; +double IN A 192.168.5.1 +; hightype IN A 192.168.1.5 hightype IN TYPE65534 \# 5 07ED260001 ; @@ -20172,3 +20174,5 @@ host-19996 IN A 192.168.1.28 host-19997 IN A 192.168.1.29 host-19998 IN A 192.168.1.30 host-19999 IN A 192.168.1.31 +; +double IN A 192.168.5.1 diff --git a/regression-tests/nsec-glue/expected_result b/regression-tests/nsec-glue/expected_result index 002855b56..e110ae3fc 100644 --- a/regression-tests/nsec-glue/expected_result +++ b/regression-tests/nsec-glue/expected_result @@ -1,4 +1,4 @@ -1 example.com. IN NSEC 86400 dsdelegation.example.com. NS SOA MX RRSIG NSEC DNSKEY +1 example.com. IN NSEC 86400 double.example.com. NS SOA MX RRSIG NSEC DNSKEY 1 example.com. IN RRSIG 86400 NSEC 8 2 86400 [expiry] [inception] [keytag] example.com. ... 1 example.com. IN RRSIG 86400 SOA 8 2 100000 [expiry] [inception] [keytag] example.com. ... 1 example.com. IN SOA 86400 ns1.example.com. ahu.example.com. 2000081501 28800 7200 604800 86400 diff --git a/regression-tests/nsec-middle/expected_result b/regression-tests/nsec-middle/expected_result index 06a61d8a8..449989d9e 100644 --- a/regression-tests/nsec-middle/expected_result +++ b/regression-tests/nsec-middle/expected_result @@ -1,4 +1,4 @@ -1 example.com. IN NSEC 86400 dsdelegation.example.com. NS SOA MX RRSIG NSEC DNSKEY +1 example.com. IN NSEC 86400 double.example.com. NS SOA MX RRSIG NSEC DNSKEY 1 example.com. IN RRSIG 86400 NSEC 8 2 86400 [expiry] [inception] [keytag] example.com. ... 1 example.com. IN RRSIG 86400 SOA 8 2 100000 [expiry] [inception] [keytag] example.com. ... 1 example.com. IN SOA 86400 ns1.example.com. ahu.example.com. 2000081501 28800 7200 604800 86400 diff --git a/regression-tests/nsec-wraparound/expected_result b/regression-tests/nsec-wraparound/expected_result index 0ff7e42e8..a06211ba0 100644 --- a/regression-tests/nsec-wraparound/expected_result +++ b/regression-tests/nsec-wraparound/expected_result @@ -1,4 +1,4 @@ -1 example.com. IN NSEC 86400 dsdelegation.example.com. NS SOA MX RRSIG NSEC DNSKEY +1 example.com. IN NSEC 86400 double.example.com. NS SOA MX RRSIG NSEC DNSKEY 1 example.com. IN RRSIG 86400 NSEC 8 2 86400 [expiry] [inception] [keytag] example.com. ... 1 example.com. IN RRSIG 86400 SOA 8 2 100000 [expiry] [inception] [keytag] example.com. ... 1 example.com. IN SOA 86400 ns1.example.com. ahu.example.com. 2000081501 28800 7200 604800 86400 diff --git a/regression-tests/nsec-wrong-type-at-apex/expected_result b/regression-tests/nsec-wrong-type-at-apex/expected_result index 38f236e6b..fe377c5d9 100644 --- a/regression-tests/nsec-wrong-type-at-apex/expected_result +++ b/regression-tests/nsec-wrong-type-at-apex/expected_result @@ -1,4 +1,4 @@ -1 example.com. IN NSEC 86400 dsdelegation.example.com. NS SOA MX RRSIG NSEC DNSKEY +1 example.com. IN NSEC 86400 double.example.com. NS SOA MX RRSIG NSEC DNSKEY 1 example.com. IN RRSIG 86400 NSEC 8 2 86400 [expiry] [inception] [keytag] example.com. ... 1 example.com. IN RRSIG 86400 SOA 8 2 100000 [expiry] [inception] [keytag] example.com. ... 1 example.com. IN SOA 86400 ns1.example.com. ahu.example.com. 2000081501 28800 7200 604800 86400 diff --git a/regression-tests/nxdomain-below-nonempty-terminal/expected_result b/regression-tests/nxdomain-below-nonempty-terminal/expected_result index 2cd6b8eca..5943dc095 100644 --- a/regression-tests/nxdomain-below-nonempty-terminal/expected_result +++ b/regression-tests/nxdomain-below-nonempty-terminal/expected_result @@ -1,4 +1,4 @@ -1 example.com. IN NSEC 86400 dsdelegation.example.com. NS SOA MX RRSIG NSEC DNSKEY +1 example.com. IN NSEC 86400 double.example.com. NS SOA MX RRSIG NSEC DNSKEY 1 example.com. IN RRSIG 86400 NSEC 8 2 86400 [expiry] [inception] [keytag] example.com. ... 1 example.com. IN RRSIG 86400 SOA 8 2 100000 [expiry] [inception] [keytag] example.com. ... 1 example.com. IN SOA 86400 ns1.example.com. ahu.example.com. 2000081501 28800 7200 604800 86400 diff --git a/regression-tests/second-level-nxdomain/expected_result b/regression-tests/second-level-nxdomain/expected_result index cebdb0c6d..3b761e31d 100644 --- a/regression-tests/second-level-nxdomain/expected_result +++ b/regression-tests/second-level-nxdomain/expected_result @@ -1,4 +1,4 @@ -1 example.com. IN NSEC 86400 dsdelegation.example.com. NS SOA MX RRSIG NSEC DNSKEY +1 example.com. IN NSEC 86400 double.example.com. NS SOA MX RRSIG NSEC DNSKEY 1 example.com. IN RRSIG 86400 NSEC 8 2 86400 [expiry] [inception] [keytag] example.com. ... 1 example.com. IN RRSIG 86400 SOA 8 2 100000 [expiry] [inception] [keytag] example.com. ... 1 example.com. IN SOA 86400 ns1.example.com. ahu.example.com. 2000081501 28800 7200 604800 86400 diff --git a/regression-tests/two-level-nxdomain/expected_result b/regression-tests/two-level-nxdomain/expected_result index dd82e70dd..06f281cdd 100644 --- a/regression-tests/two-level-nxdomain/expected_result +++ b/regression-tests/two-level-nxdomain/expected_result @@ -1,4 +1,4 @@ -1 example.com. IN NSEC 86400 dsdelegation.example.com. NS SOA MX RRSIG NSEC DNSKEY +1 example.com. IN NSEC 86400 double.example.com. NS SOA MX RRSIG NSEC DNSKEY 1 example.com. IN RRSIG 86400 NSEC 8 2 86400 [expiry] [inception] [keytag] example.com. ... 1 example.com. IN RRSIG 86400 SOA 8 2 100000 [expiry] [inception] [keytag] example.com. ... 1 example.com. IN SOA 86400 ns1.example.com. ahu.example.com. 2000081501 28800 7200 604800 86400 -- 2.40.0