Make sure webrick is running before testing

diff --git a/modules/remotebackend/regression-tests/http-backend.rb b/modules/remotebackend/regression-tests/http-backend.rb
index 8be678a877df4e3a1ab05a214e9cb57276d7c699..6581a12fbb60bb8e5b3f190d5ffbc780e20a9ecc 100755 (executable)
--- a/modules/remotebackend/regression-tests/http-backend.rb
+++ b/modules/remotebackend/regression-tests/http-backend.rb
@@ -14,6 +14,7 @@ server = WEBrick::HTTPServer.new(
 
 be = Handler.new("../modules/remotebackend/regression-tests/remote.sqlite3") 
 server.mount "/dns", DNSBackendHandler, be
+server.mount_proc("/ping"){ |req,resp| resp.body = "pong" }
 
 trap('INT') { server.stop }
 trap('TERM') { server.stop }

diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop
index a75f38e7eccc1f0dd31fb905f33f7bae230e69fc..a7f1735e46239eaa8a841269679589debc153bee 100755 (executable)
--- a/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@ -511,7 +511,13 @@ __EOF__
                                $testsdir/http-backend.rb &
                                echo $! > pdns-remotebackend.pid
                                # make sure it runs before continuing
-                               sleep 2
+                               loopcount=0
+                               while [ $loopcount -lt 20 ]; do
+                                    res=$(curl http://localhost:62434/ping 2>/dev/null)
+                                    if [ "x$res" == "xpong" ]; then break; fi
+                                    sleep 1
+                                    let loopcount=loopcount+1
+                               done
                                ;;
                        unix)
                                connstr="unix:path=/tmp/remote.socket"