From ca92b023631401bde72c5f67512dd03cf057dff6 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Fri, 3 Feb 2012 04:44:17 +0000 Subject: [PATCH] I:waiting for nameserver to load, ok'd by Evan --- bin/tests/system/lwresd/clean.sh | 3 ++- bin/tests/system/lwresd/tests.sh | 18 +++++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/bin/tests/system/lwresd/clean.sh b/bin/tests/system/lwresd/clean.sh index 107a0209dd..6e52638934 100644 --- a/bin/tests/system/lwresd/clean.sh +++ b/bin/tests/system/lwresd/clean.sh @@ -14,9 +14,10 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.1 2008/07/17 01:14:16 marka Exp $ +# $Id: clean.sh,v 1.2 2012/02/03 04:44:17 marka Exp $ # # Clean up after lwresd tests. # rm -f */named.memstats +rm -f dig.out diff --git a/bin/tests/system/lwresd/tests.sh b/bin/tests/system/lwresd/tests.sh index cb5cedf91b..c6c9231c6f 100644 --- a/bin/tests/system/lwresd/tests.sh +++ b/bin/tests/system/lwresd/tests.sh @@ -15,12 +15,28 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: tests.sh,v 1.20 2011/10/17 23:46:33 tbox Exp $ +# $Id: tests.sh,v 1.21 2012/02/03 04:44:17 marka Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh status=0 +echo "I:waiting for nameserver to load" +for i in 0 1 2 3 4 5 6 7 8 9 +do + ret=0 + for zone in . example1 e.example1 example2 10.10.10.in-addr.arpa \ + ip6.int ip6.arpa + do + $DIG +tcp -p 5300 @10.53.0.1 soa $zone > dig.out + grep "status: NOERROR" dig.out > /dev/null || ret=1 + grep "ANSWER: 1," dig.out > /dev/null || ret=1 + done + test $ret = 0 && break + sleep 1 +done +if [ $ret != 0 ]; then echo "I:failed"; fi +status=`expr $status + $ret` echo "I:using resolv.conf" ret=0