From: Mark Andrews <marka@isc.org>
Date: Tue, 5 Mar 2013 06:23:06 +0000 (+1100)
Subject: check that the lwresd server has started before querying it
X-Git-Tag: v9.10.0a1~448^2~104
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=ab8ea5c51e8a875d39b5a720a959393fe9c7f044;p=thirdparty%2Fbind9.git

check that the lwresd server has started before querying it
(cherry picked from commit 661f1197a200bdd3d2411e9b02a46b93fb1fb083)
---

diff --git a/bin/tests/system/lwresd/clean.sh b/bin/tests/system/lwresd/clean.sh
index 8eeb1583f1e..c6ab8f19ffd 100644
--- a/bin/tests/system/lwresd/clean.sh
+++ b/bin/tests/system/lwresd/clean.sh
@@ -21,3 +21,4 @@
 #
 rm -f */named.memstats
 rm -f dig.out
+rm -f lwresd1/lwresd.run.resolv
diff --git a/bin/tests/system/lwresd/tests.sh b/bin/tests/system/lwresd/tests.sh
index 6c053333096..37bac14c2d7 100644
--- a/bin/tests/system/lwresd/tests.sh
+++ b/bin/tests/system/lwresd/tests.sh
@@ -40,6 +40,11 @@ status=`expr $status + $ret`
 
 echo "I:using resolv.conf"
 ret=0
+for i in 0 1 2 3 4 5 6 7 8 9 
+do
+	grep ' running$' lwresd1/lwresd.run > /dev/null && break
+	sleep 1
+done
 ./lwtest || ret=1
 if [ $ret != 0 ]; then
 	echo "I:failed"
@@ -48,11 +53,17 @@ status=`expr $status + $ret`
 
 $PERL $SYSTEMTESTTOP/stop.pl . lwresd1
 
+mv lwresd1/lwresd.run lwresd1/lwresd.run.resolv
+
 $PERL $SYSTEMTESTTOP/start.pl . lwresd1 -- "-m record,size,mctx -c lwresd.conf -d 99 -g"
 
 echo "I:using lwresd.conf"
 ret=0
-sleep 1 # allow lwresd to finish starting.
+for i in 0 1 2 3 4 5 6 7 8 9 
+do
+	grep ' running$' lwresd1/lwresd.run > /dev/null && break
+	sleep 1
+done
 ./lwtest || ret=1
 if [ $ret != 0 ]; then
 	echo "I:failed"