From: Evan Hunt <each@isc.org>
Date: Fri, 11 Jan 2019 22:37:21 +0000 (-0800)
Subject: fix testing errors
X-Git-Tag: v9.13.6~59^2
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=82e83d5dc7abdb05908c7971571eaa2d673d8691;p=thirdparty%2Fbind9.git

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
---

diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh
index 9368f9b9126..d45decdd87f 100644
--- a/bin/tests/system/dnssec/tests.sh
+++ b/bin/tests/system/dnssec/tests.sh
@@ -57,16 +57,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" -eq 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 () {