]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
do not start bind tests until bindbackend has loaded all zones
authorPeter van Dijk <peter.van.dijk@netherlabs.nl>
Mon, 24 Sep 2012 12:09:30 +0000 (12:09 +0000)
committerPeter van Dijk <peter.van.dijk@netherlabs.nl>
Mon, 24 Sep 2012 12:09:30 +0000 (12:09 +0000)
git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2719 d19b8d6e-7fed-0310-83ef-9ca221ded41b

regression-tests/start-test-stop

index 30bca3844f1af30ed68491845d376712ea6cd951..8dbbda92a8603a404bde2f02e8c5ec97b947cc21 100755 (executable)
@@ -7,6 +7,19 @@ tosql ()
 
 }
 
+bindwait ()
+{
+       domcount=$(grep -c zone named.conf)
+       while sleep 10
+       do
+               done=$( (../pdns/pdns_control --socket-dir=. --no-config bind-domain-status || true) | grep -c 'parsed into memory' || true )
+               if [ $done = $domcount ]
+               then
+                       return
+               fi
+       done
+}
+
 port=$1
 [ -z "$port" ] && port=5300
 context=$2
@@ -41,7 +54,7 @@ rm -f pdns*.pid
 
 presigned=no
 
-if [ ${context: -10} = "-presigned" ]
+if [ "${context: -10}" = "-presigned" ]
 then
        presigned=yes
        port=$((port-100))
@@ -55,6 +68,7 @@ case $context in
                                --fancy-records --send-root-referral    \
                                --cache-ttl=0 --no-config &
                        skipreasons=nodnssec
+                       bindwait
                        ;;
                bind-dnssec | bind-dnssec-nsec3 )
                        ./bind-dnssec-setup
@@ -73,6 +87,7 @@ case $context in
                                --bind-dnssec-db=./dnssec.sqlite3 \
                         --send-root-referral    \
                                --cache-ttl=0 --no-config &
+                       bindwait
                        ;;
                gmysql-nodnssec)
                        [ -z "$GMYSQLDB" ] && GMYSQLDB=pdnstest