From 87015bdec28c90fc522153814792ff9d08d243b4 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Tue, 5 Mar 2013 17:23:06 +1100
Subject: [PATCH] check that the lwresd server has started before querying it
 (cherry picked from commit 661f1197a200bdd3d2411e9b02a46b93fb1fb083)

---
 bin/tests/system/lwresd/clean.sh |  1 +
 bin/tests/system/lwresd/tests.sh | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/bin/tests/system/lwresd/clean.sh b/bin/tests/system/lwresd/clean.sh
index 8425ec4bdd..aacc526255 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 e6a67d6366..665d57e242 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"