Check TTLs of mixed TTL ANY response with expired records

diff --git a/bin/tests/system/resolver/ns4/tld1.db b/bin/tests/system/resolver/ns4/tld1.db
index 4bcfcf5f024da4e71c87ee5b6f9c4eca1dfb1309..03d79088feb2f8f1f1b23fd069a0e1f47d39793e 100644 (file)
--- a/bin/tests/system/resolver/ns4/tld1.db
+++ b/bin/tests/system/resolver/ns4/tld1.db
@@ -30,3 +30,6 @@ edns-version.tld.     NS      ns.edns-version.tld.
 ns.edns-version.tld.   A       10.53.0.7
 cname                  CNAME   ns7
 ns7                    A       10.53.0.7
+mixedttl 10            A       10.0.0.1
+mixedttl 15            TXT     a TXT record
+mixedttl 20            AAAA    2001:db8::1

diff --git a/bin/tests/system/resolver/ns4/tld2.db b/bin/tests/system/resolver/ns4/tld2.db
index 45dc6943a530b2d2426da9a48d1266d30f7885ff..c3a96d9f4fe90b370adff0f5f385043524ced8b1 100644 (file)
--- a/bin/tests/system/resolver/ns4/tld2.db
+++ b/bin/tests/system/resolver/ns4/tld2.db
@@ -30,3 +30,6 @@ edns-version.tld.     NS      ns.edns-version.tld.
 ns.edns-version.tld.   A       10.53.0.7
 cname                  CNAME   ns7
 ns7                    A       10.53.0.7
+mixedttl 10            A       10.0.0.1
+mixedttl 15            TXT     a TXT record
+mixedttl 20            AAAA    2001:db8::1

diff --git a/bin/tests/system/resolver/tests.sh b/bin/tests/system/resolver/tests.sh
index 8c0a50949738659d67b65118612912240fc44187..33a72383f31389288c45a322d2157d920eb3d618 100755 (executable)
--- a/bin/tests/system/resolver/tests.sh
+++ b/bin/tests/system/resolver/tests.sh
@@ -860,5 +860,24 @@ grep "status: NOERROR" dig.out.ns9.${n} > /dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
+n=$((n+1))
+echo_i "check expired TTLs with qtype * (${n})"
+ret=0
+dig_with_opts +tcp @10.53.0.5 mixedttl.tld any > dig.out.1.${n} || ret=1
+ttl1=$(awk '$1 == "mixedttl.tld." && $4 == "A" { print $2 + 1 }' dig.out.1.${n})
+# sleep TTL + 1 so that record has expired
+sleep "${ttl1:-0}"
+dig_with_opts +tcp @10.53.0.5 mixedttl.tld any > dig.out.2.${n} || ret=1
+# check preconditions
+grep "ANSWER: 3," dig.out.1.${n} > /dev/null || ret=1
+lines=$(awk '$1 == "mixedttl.tld." && $2 > 30 { print }' dig.out.1.${n} | wc -l)
+test ${lines:-1} -ne 0 && ret=1
+# check behaviour (there may be 1 answer on very slow machines)
+grep "ANSWER: [12]," dig.out.2.${n} > /dev/null || ret=1
+lines=$(awk '$1 == "mixedttl.tld." && $2 > 30 { print }' dig.out.2.${n} | wc -l)
+test ${lines:-1} -ne 0 && ret=1
+if [ $ret != 0 ]; then echo_i "failed"; fi
+status=$((status + ret))
+
 echo_i "exit status: $status"
 [ $status -eq 0 ] || exit 1