From: Mark Andrews <marka@isc.org>
Date: Tue, 5 Dec 2017 10:38:28 +0000 (+1100)
Subject: set the DNSKEY deletion time to now+5 once we got all the zones into their initial... 
X-Git-Tag: v9.12.0rc1~10
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=ecafa2ae506b8cae3660de29d66c10af656174c5;p=thirdparty%2Fbind9.git

set the DNSKEY deletion time to now+5 once we got all the zones into their initial state
---

diff --git a/bin/tests/system/autosign/ns3/keygen.sh b/bin/tests/system/autosign/ns3/keygen.sh
index 9afbc34bf19..5fa09c76a89 100644
--- a/bin/tests/system/autosign/ns3/keygen.sh
+++ b/bin/tests/system/autosign/ns3/keygen.sh
@@ -284,12 +284,11 @@ $KEYGEN -a RSASHA1 -3 -q -r $RANDFILE -P now -A now+3600 $zone > kg.out 2>&1 ||
 $DSFROMKEY $ksk.key > dsset-${zone}$TP
 
 #
-#  A zone that starts with a active KSK + ZSK and a inactive ZSK which becomes
-#  a zone with a active KSK and a inactive ZSK after 20 seconds.
+#  A zone that starts with a active KSK + ZSK and a inactive ZSK.
 #
 setup inaczsk3.example
 cp $infile $zonefile
 ksk=`$KEYGEN -a NSEC3RSASHA1 -3 -q -r $RANDFILE -fk $zone 2> kg.out` || dumpit kg.out
-$KEYGEN -a NSEC3RSASHA1 -3 -q -r $RANDFILE -D now+20 $zone > kg.out 2>&1 || dumpit kg.out
+$KEYGEN -a NSEC3RSASHA1 -3 -q -r $RANDFILE $zone > kg.out 2>&1 || dumpit kg.out
 $KEYGEN -a NSEC3RSASHA1 -3 -q -r $RANDFILE -P now -A now+3600 $zone > kg.out 2>&1 || dumpit kg.out
 $DSFROMKEY $ksk.key > dsset-${zone}$TP
diff --git a/bin/tests/system/autosign/tests.sh b/bin/tests/system/autosign/tests.sh
index 2627937aa25..7a5d48fb7b2 100644
--- a/bin/tests/system/autosign/tests.sh
+++ b/bin/tests/system/autosign/tests.sh
@@ -104,6 +104,9 @@ count=`awk 'BEGIN { count = 0 }
        $4 == "DNSKEY" { count++ }
        END {print count}' dig.out.ns3.test$n`
 test $count -eq 3 || ret=1
+id=`awk '$4 == "RRSIG" && $5 == "CNAME" { printf "%05u\n", $11 }' dig.out.ns3.test$n`
+$SETTIME -D now+5 ns3/Kinaczsk3.example.+007+${id}
+$RNDC -c ../common/rndc.conf -s 10.53.0.3 -p 9953 loadkeys inaczsk3.example
 n=`expr $n + 1`
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`