Wait a little bit longer for autosign, bail out on not enough categories

(cherry picked from commit f1cbdc54980b4e94ea4a9da631b4a50caaabb570)

diff --git a/bin/tests/system/autosign/tests.sh b/bin/tests/system/autosign/tests.sh
index 805cadb2e248b1635814f710cddf9236035d53a7..838e8c6a85b3cc0f695ab366ce156d364e8c1cba 100755 (executable)
--- a/bin/tests/system/autosign/tests.sh
+++ b/bin/tests/system/autosign/tests.sh
@@ -97,6 +97,7 @@ checkjitter () {
        done
        if [ "$_count" -lt 8 ]; then
                echo_i "error: not enough categories"
+               return 1
        fi
 
        # Calculate mean
@@ -1047,13 +1048,15 @@ $KEYGEN -a rsasha1 -3 -q -K ns3 jitter.nsec3.example > /dev/null
 # Trigger zone signing.
 ($RNDCCMD 10.53.0.3 sign jitter.nsec3.example. 2>&1 | sed 's/^/ns3 /' | cat_i) || ret=1
 # Wait until zone has been signed.
-for i in 0 1 2 3 4 5 6 7 8 9; do
+i=0
+while [ "$i" -lt 20 ]; do
        failed=0
        $DIG $DIGOPTS axfr jitter.nsec3.example @10.53.0.3 > dig.out.ns3.test$n || failed=1
        grep "NSEC3PARAM" dig.out.ns3.test$n > /dev/null || failed=1
        [ $failed -eq 0 ] && break
        echo_i "waiting ... ($i)"
-       sleep 2
+       sleep $((i/5))
+       i=$((i+1))
 done
 [ $failed != 0 ] && echo_i "error: no NSEC3PARAM found in AXFR" && ret=1
 # Check jitter distribution.