From: Mark Andrews <marka@isc.org>
Date: Wed, 4 Mar 2020 04:39:08 +0000 (+1100)
Subject: properly wait for zone to be loaded
X-Git-Tag: v9.17.1~83^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0abcface49789c5fdc28fec062cdf692c43a3e7a;p=thirdparty%2Fbind9.git

properly wait for zone to be loaded
---

diff --git a/bin/tests/system/masterformat/tests.sh b/bin/tests/system/masterformat/tests.sh
index cdc03c4ac08..58485285e55 100755
--- a/bin/tests/system/masterformat/tests.sh
+++ b/bin/tests/system/masterformat/tests.sh
@@ -237,13 +237,12 @@ grep "NXDOMAIN" "dig.out.dynamic2.ns3.test$n" > /dev/null 2>&1 || ret=1
 # using "rndc halt" ensures that we don't dump the zone file
 $PERL $SYSTEMTESTTOP/stop.pl --use-rndc --halt --port ${CONTROLPORT} rndc ns3
 restart
-for i in 0 1 2 3 4 5 6 7 8 9; do
-    lret=0
-    dig_with_opts @10.53.0.3 newtext.dynamic txt > "dig.out.dynamic3.ns3.test$n"
-    grep "added text" "dig.out.dynamic3.ns3.test$n" > /dev/null 2>&1 || lret=1
-    [ $lret -eq 0 ] && break;
-done
-[ $lret -eq 1 ] && ret=1
+check_added_text() {
+	dig_with_opts @10.53.0.3 newtext.dynamic txt > "dig.out.dynamic3.ns3.test$n" || return 1
+	grep "added text" "dig.out.dynamic3.ns3.test$n" > /dev/null || return 1
+	return 0
+}
+retry_quiet 10 check_added_text || ret=1
 dig_with_opts +comm @10.53.0.3 added.dynamic txt > "dig.out.dynamic4.ns3.test$n"
 grep "NXDOMAIN" "dig.out.dynamic4.ns3.test$n" > /dev/null 2>&1 || ret=1
 n=$((n+1))