fix testing errors

- the checkprivate function in the dnssec test set ret=0, erasing
  results from previous tests and making the test appear to have passed
  when it shouldn't have
- checkprivate needed a delay loop to ensure there was time for all
  private signing records to be updated before the test

(cherry picked from commit 82e83d5dc7abdb05908c7971571eaa2d673d8691)

diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh
index 1113e1d404e9ed4d80678850ea1bdc0eb445d890..65607392b92a4c4be9271d5e7746da560354db3c 100644 (file)
--- a/bin/tests/system/dnssec/tests.sh
+++ b/bin/tests/system/dnssec/tests.sh
@@ -40,16 +40,18 @@ showprivate () {
 }
 
 # check that signing records are marked as complete
-checkprivate () {
-    ret=0
-    x=`showprivate "$@"`
-    echo $x | grep incomplete >/dev/null 2>&1 && ret=1
-    [ $ret = 1 ] && {
-        echo "$x"
-        echo_i "failed"
+checkprivate () { (
+    for i in 1 2 3 4 5 6 7 8 9 10; do
+        ret=0
+        showprivate "$@" | grep incomplete >/dev/null 2>&1 && { ret=1; sleep 1; continue; }
+        break
+    done
+    [ $ret -eq 1 ] && {
+        echo_d "$1 signing incomplete"
+        return 1
     }
-    return $ret
-}
+    return 0
+) }
 
 # check that a zone file is raw format, version 0
 israw0 () {