Merge branch '4498-gl-4495-followup-regression-test-was-too-strict' into 'main'

Resolve "[GL #4494] followup: regression test was too strict"

Closes #4498

See merge request isc-projects/bind9!8590
This commit is contained in:
Mark Andrews
2023-12-19 22:48:51 +00:00

View File

@@ -1327,9 +1327,11 @@ status=$((status + ret))
echo_i "check that the startup change from NSEC3 to NSEC is properly signed ($n)"
ret=0
$JOURNALPRINT ns3/nsec3-to-nsec.example.db.jnl \
| awk 'BEGIN { count=0; ok=0 }
$1 == "del" && $5 == "SOA" { count++; if (count == 2) { if (ok) { exit(0); } else { exit(1); } } }
$1 == "add" && $5 == "RRSIG" && $6 == "TYPE65534" { ok=1 }
| awk 'BEGIN { private=0; rrsig=0; ok=0 }
$1 == "del" && $5 == "SOA" { if (private || rrsig) { if (private == rrsig) { exit(0); } else { exit(1); } } }
$1 == "add" && $5 == "TYPE65534" { private=1 }
$1 == "add" && $5 == "RRSIG" && $6 == "TYPE65534" { rrsig=1 }
END { if (private || rrsig) { if (private == rrsig) { exit(0); } else { exit(1); } } else { exit (1); } }
' || ret=1
n=$((n + 1))
if [ "$ret" -ne 0 ]; then echo_i "failed"; fi