From: Mark Andrews <marka@isc.org>
Date: Wed, 4 Dec 2019 23:42:33 +0000 (+1100)
Subject: loop waiting for the redirect zone to load
X-Git-Tag: v9.15.7~34^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4b1d0b68653a76ec58ff5b3c67f2c703ec63e07;p=thirdparty%2Fbind9.git

loop waiting for the redirect zone to load
---

diff --git a/bin/tests/system/addzone/tests.sh b/bin/tests/system/addzone/tests.sh
index a4c1ca425db..ff3840f058a 100755
--- a/bin/tests/system/addzone/tests.sh
+++ b/bin/tests/system/addzone/tests.sh
@@ -225,9 +225,12 @@ ret=0
 sleep 1
 cp -f ns1/redirect.db.2 ns1/redirect.db
 $RNDCCMD 10.53.0.1 reload -redirect > rndc.out.ns1.$n
-$RNDCCMD 10.53.0.1 zonestatus -redirect > zonestatus.out.ns1.$n
-grep "type: redirect" zonestatus.out.ns1.$n > /dev/null || ret=1
-grep "serial: 1" zonestatus.out.ns1.$n > /dev/null || ret=1
+_check_zonestatus() {
+    $RNDCCMD 10.53.0.1 zonestatus -redirect > zonestatus.out.ns1.$n || return 1
+    grep "type: redirect" zonestatus.out.ns1.$n > /dev/null || return 1
+    grep "serial: 1" zonestatus.out.ns1.$n > /dev/null || return 1
+}
+retry 5 _check_zonestatus || ret=1
 n=`expr $n + 1`
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`