2
0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-03 16:15:27 +00:00

Merge branch 'ondrej/each-fix-dnssec-test-error-bis' into 'master'

b/t/s/dnssec/tests.sh: Cleanup showprivate() function

See merge request isc-projects/bind9!1335
This commit is contained in:
Evan Hunt
2019-01-14 15:17:56 -05:00

View File

@@ -57,18 +57,14 @@ showprivate () {
} }
# check that signing records are marked as complete # check that signing records are marked as complete
checkprivate () { ( checkprivate () {
for i in 1 2 3 4 5 6 7 8 9 10; do for i in 1 2 3 4 5 6 7 8 9 10; do
ret=0 showprivate "$@" | grep -q incomplete || return 0
showprivate "$@" | grep incomplete >/dev/null 2>&1 && { ret=1; sleep 1; continue; } sleep 1
break
done done
[ $ret -eq 1 ] && { echo_d "$1 signing incomplete"
echo_d "$1 signing incomplete" return 1
return 1 }
}
return 0
) }
# check that a zone file is raw format, version 0 # check that a zone file is raw format, version 0
israw0 () { israw0 () {