properly wait for zone to be loaded

(cherry picked from commit 0abcface49789c5fdc28fec062cdf692c43a3e7a)

diff --git a/bin/tests/system/masterformat/tests.sh b/bin/tests/system/masterformat/tests.sh
index b8c9a4f272732725eecc9606a27c651ed9c2290b..457bbb0f492dd2d9e360bff360d8cca47bcf1823 100755 (executable)
--- a/bin/tests/system/masterformat/tests.sh
+++ b/bin/tests/system/masterformat/tests.sh
@@ -236,13 +236,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))