From 353018c0e5a428c8314c103267fcfd18213e9e39 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Tue, 19 May 2020 10:09:51 +1000 Subject: [PATCH 1/2] Address race in dnssec system test. 'clear signing records' can fail as the update triggers by the rndc command to clear the signing records may not have completed by the time the subsequent rndc command to test that the records have been removed is commenced. Loop several times to prevent false negative. --- bin/tests/system/dnssec/tests.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) 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)) From 3405ee9eb2e124451dc2837f07ff337f9d5b71b1 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Tue, 19 May 2020 10:15:49 +1000 Subject: [PATCH 2/2] Add CHANGES --- CHANGES | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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