From e4b1d0b68653a76ec58ff5b3c67f2c703ec63e07 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 5 Dec 2019 10:42:33 +1100 Subject: [PATCH] loop waiting for the redirect zone to load --- bin/tests/system/addzone/tests.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/bin/tests/system/addzone/tests.sh b/bin/tests/system/addzone/tests.sh index a4c1ca425d..ff3840f058 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`