From 3c9a7ffac8d68b9662685b355611da3a1d204945 Mon Sep 17 00:00:00 2001 From: Matthijs Mekking Date: Wed, 24 Apr 2019 09:16:59 +0200 Subject: [PATCH] Wait for correct log message in dnssec/tests.sh In 9.11 there are some log messages not existing, but the tests rely on. Adjust the grep call that gives confidence the rollover step has occurred. --- bin/tests/system/dnssec/tests.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh index a93526d3d1..71bf407e16 100644 --- a/bin/tests/system/dnssec/tests.sh +++ b/bin/tests/system/dnssec/tests.sh @@ -3821,8 +3821,7 @@ done echo_i "wait until new ZSK $ZSK_ID3 active and ZSK $ZSK_ID2 inactive" for i in 1 2 3 4 5 6 7 8 9 10; do ret=0 - grep "DNSKEY $zone/$DEFAULT_ALGORITHM/$ZSK_ID3 (ZSK) is now active" ns2/named.run > /dev/null || ret=1 - grep "DNSKEY $zone/$DEFAULT_ALGORITHM/$ZSK_ID2 (ZSK) is now inactive" ns2/named.run > /dev/null || ret=1 + grep "add re-sign updatecheck-kskonly\.secure\..*RRSIG.*SOA.*$ZSK_ID3.*$zone.*" ns2/named.run > /dev/null || ret=1 [ "$ret" -eq 0 ] && break sleep 1 done