From 17d25dbf4745d698c1b1751f9421b8153e1e198e Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Fri, 13 Dec 2019 14:45:24 +1100 Subject: [PATCH] Fix autosign system test issues. * report when NSEC3PARAM is not yet present * allow more time for NSEC3PARAM to become present * adjust frequency failure message --- bin/tests/system/autosign/tests.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/bin/tests/system/autosign/tests.sh b/bin/tests/system/autosign/tests.sh index 014126e320..b6440c1393 100755 --- a/bin/tests/system/autosign/tests.sh +++ b/bin/tests/system/autosign/tests.sh @@ -117,8 +117,12 @@ checkjitter () { echo_i "checking whether all frequencies fall into <$_low;$_high> range" for _num in $_expiretimes do - if [ $_num -gt $_high ] || [ $_num -lt $_low ]; then - echo_i "error: too many RRSIG records ($_num) with the same expiration time" + if [ $_num -gt $_high ]; then + echo_i "error: too many RRSIG records ($_num) in expiration bucket" + _ret=1 + fi + if [ $_num -lt $_low ]; then + echo_i "error: too few RRSIG records ($_num) in expiration bucket" _ret=1 fi done @@ -1051,7 +1055,10 @@ check_if_nsec3param_exists() { $DIG $DIGOPTS NSEC3PARAM jitter.nsec3.example @10.53.0.3 > dig.out.ns3.1.test$n || return 1 grep -q "^jitter\.nsec3\.example\..*NSEC3PARAM" dig.out.ns3.1.test$n || return 1 } -retry_quiet 20 check_if_nsec3param_exists || ret=1 +retry_quiet 40 check_if_nsec3param_exists || { + echo_i "error: NSEC3PARAM not present yet" + ret=1 +} $DIG $DIGOPTS AXFR jitter.nsec3.example @10.53.0.3 > dig.out.ns3.2.test$n || ret=1 # Check jitter distribution. checkjitter dig.out.ns3.2.test$n || ret=1