From 26bffe81fe7c2a63d143b273a9bf7ccb05ba42a4 Mon Sep 17 00:00:00 2001 From: Remi Gacogne Date: Thu, 30 Nov 2017 15:29:30 +0100 Subject: [PATCH] rec: Normalize the TTLs for default.example.net. in the RPZ tests Since we ask for several records that are CNAME to default.example.net. the TTL might have been decreased by the time we get to the last ones. That's fine, the TTL we are interested in are for other records, so we can just ignore the TTL for this exact record. --- regression-tests.recursor/RPZ/command | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/regression-tests.recursor/RPZ/command b/regression-tests.recursor/RPZ/command index 6de706fe8..2d54e2bcc 100755 --- a/regression-tests.recursor/RPZ/command +++ b/regression-tests.recursor/RPZ/command @@ -21,11 +21,11 @@ $SDIG $nameserver 5301 capped-ttl.example.net a recurse 2>&1 echo "==> defpol-with-ttl.example.net should use the default policy's TTL and not the zone one" $SDIG $nameserver 5301 defpol-with-ttl.example.net a recurse 2>&1 echo "==> defpol-with-ttl-capped.example.net should use the default policy's TTL, but capped to maxTTL" -$SDIG $nameserver 5301 defpol-with-ttl-capped.example.net a recurse 2>&1 +$SDIG $nameserver 5301 defpol-with-ttl-capped.example.net a recurse 2>&1 | sed 's/\(0\tdefault.example.net.\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\115/' echo "==> defpol-without-ttl.example.net should use the zone's TTL" -$SDIG $nameserver 5301 defpol-without-ttl.example.net a recurse 2>&1 +$SDIG $nameserver 5301 defpol-without-ttl.example.net a recurse 2>&1 | sed 's/\(0\tdefault.example.net.\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\115/' echo "==> defpol-without-ttl-capped.example.net should use the zone's TTL but capped to maxTTL" -$SDIG $nameserver 5301 defpol-without-ttl-capped.example.net a recurse 2>&1 +$SDIG $nameserver 5301 defpol-without-ttl-capped.example.net a recurse 2>&1 | sed 's/\(0\tdefault.example.net.\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\115/' echo "==> unsupported.example.net has an unsupported target, should be ignored from the RPZ zone" $SDIG $nameserver 5301 unsupported.example.net a recurse 2>&1 echo "==> unsupported2.example.net has an unsupported target, should be ignored from the RPZ zone" -- 2.50.0