diff --git a/CHANGES b/CHANGES index 9128e777d6..b74f254722 100644 --- a/CHANGES +++ b/CHANGES @@ -1,8 +1,11 @@ +5415. [test] Address race in dnssec system test that led to + test failures. [GL #1852] + 5414. [test] Adjust time allowed for journal truncation to occur in nsupdate system test to avoid test failure. [GL #1855] -5413. [test] Address race in autosign system test that lead to +5413. [test] Address race in autosign system test that led to test failures. [GL #1852] 5412. [bug] 'provide-ixfr no;' fail to return up-to-date responses diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh index 894b268ddf..9d7597c8e2 100644 --- a/bin/tests/system/dnssec/tests.sh +++ b/bin/tests/system/dnssec/tests.sh @@ -2650,12 +2650,15 @@ status=$((status+ret)) echo_i "clear signing records ($n)" { rndccmd 10.53.0.3 signing -clear all update-nsec3.example > /dev/null; } 2>&1 || ret=1 -sleep 1 -{ rndccmd 10.53.0.3 signing -list update-nsec3.example > signing.out; } 2>&1 -grep -q "No signing records found" signing.out || { - ret=1 - sed 's/^/ns3 /' signing.out | cat_i +check_no_signing_record_found() { + { rndccmd 10.53.0.3 signing -list update-nsec3.example > signing.out; } 2>&1 + grep -q "No signing records found" signing.out || { + sed 's/^/ns3 /' signing.out | cat_i + return 1 + } + return 0 } +retry_quiet 5 check_no_signing_record_found || ret=1 n=$((n+1)) test "$ret" -eq 0 || echo_i "failed" status=$((status+ret))