fix AXFR-SOURCE tests

diff --git a/regression-tests/backends/godbc_mssql-slave b/regression-tests/backends/godbc_mssql-slave
index 8a16b1bc66a2ee61f2565986df3a0b0e0197d493..4b7b02ddb74f0add0bb86a1e6c1bd467b2451678 100644 (file)
--- a/regression-tests/backends/godbc_mssql-slave
+++ b/regression-tests/backends/godbc_mssql-slave
@@ -22,7 +22,7 @@ __EOF__
                fi
                if [ "$zone" = "stest.com" ]; then
                        if [[ $skipreasons != *nolua* ]]; then
-                               $PDNSUTIL --config-dir=. --config-name=gmysql2 set-meta stest.com AXFR-SOURCE 127.0.0.2
+                               $PDNSUTIL --config-dir=. --config-name=godbc2 set-meta stest.com AXFR-SOURCE 127.0.0.2
                        fi
                fi
        done

diff --git a/regression-tests/backends/gpgsql-master b/regression-tests/backends/gpgsql-master
index 21447683f2e1306f73efffd3a96edde5035e191f..448fb7b13a9467411325da6f1e69078e4bd9ae33 100644 (file)
--- a/regression-tests/backends/gpgsql-master
+++ b/regression-tests/backends/gpgsql-master
@@ -5,8 +5,8 @@ case $context in
                [ -z "$GPGSQLDB" ] && GPGSQLDB=pdnstest
                [ -z "$GPGSQLUSER" ] && GPGSQLUSER=$(whoami)
 
-               dropdb --user="$GPGSQLUSER" "$GPGSQLDB" || echo ignoring mysqladmin drop failure
-               createdb --user="$GPGSQLUSER" "$GPGSQLDB"       || echo ignoring mysqladmin drop failure
+               dropdb --user="$GPGSQLUSER" "$GPGSQLDB" || echo ignoring dropdb failure
+               createdb --user="$GPGSQLUSER" "$GPGSQLDB"       || echo ignoring createdb failure
                psql --user="$GPGSQLUSER" "$GPGSQLDB" < ../modules/gpgsqlbackend/schema.pgsql.sql
                tosql gpgsql | psql --user="$GPGSQLUSER" "$GPGSQLDB" 2>&1 | uniq -c
                 psql --user="$GPGSQLUSER" -c "ANALYZE" "$GPGSQLDB"

diff --git a/regression-tests/backends/gpgsql-slave b/regression-tests/backends/gpgsql-slave
index bbeb81298ff9b1f6b1f5ec33a4f8af1f315c5adf..b7ca8beb506edbde1ba261445cc9d418c6c23c31 100644 (file)
--- a/regression-tests/backends/gpgsql-slave
+++ b/regression-tests/backends/gpgsql-slave
@@ -1,9 +1,9 @@
-       context=${context}-presigned-gpgql
+       context=${context}-presigned-gpgsql
        [ -z "$GPGSQ2LDB" ] && GPGSQL2DB=pdnstest2
        [ -z "$GPGSQL2USER" ] && GPGSQL2USER=$(whoami)
 
-       dropdb --user="$GPGSQL2USER" "$GPGSQL2DB" || echo ignoring mysqladmin drop failure
-       createdb --user="$GPGSQL2USER" "$GPGSQL2DB" || echo ignoring mysqladmin drop failure
+       dropdb --user="$GPGSQL2USER" "$GPGSQL2DB" || echo ignoring dropdb failure
+       createdb --user="$GPGSQL2USER" "$GPGSQL2DB" || echo ignoring createdb failure
        psql --user="$GPGSQL2USER" "$GPGSQL2DB" < ../modules/gpgsqlbackend/schema.pgsql.sql
 
        cat > pdns-gpgsql2.conf << __EOF__
@@ -29,7 +29,7 @@ __EOF__
                fi
                if [ "$zone" = "stest.com" ]; then
                        if [[ $skipreasons != *nolua* ]]; then
-                               $PDNSUTIL --config-dir=. --config-name=gmysql2 set-meta stest.com AXFR-SOURCE 127.0.0.2
+                               $PDNSUTIL --config-dir=. --config-name=gpgsql2 set-meta stest.com AXFR-SOURCE 127.0.0.2
                        fi
                fi
        done

diff --git a/regression-tests/backends/gsqlite3-slave b/regression-tests/backends/gsqlite3-slave
index cfa7ffaa766735e128333c90229589d92fa855a8..695644cb36f95bc276b726265789a9ad03d7421b 100644 (file)
--- a/regression-tests/backends/gsqlite3-slave
+++ b/regression-tests/backends/gsqlite3-slave
@@ -23,7 +23,7 @@ __EOF__
                fi
                if [ "$zone" = "stest.com" ]; then
                        if [[ $skipreasons != *nolua* ]]; then
-                               $PDNSUTIL --config-dir=. --config-name=gmysql2 set-meta stest.com AXFR-SOURCE 127.0.0.2
+                               $PDNSUTIL --config-dir=. --config-name=gsqlite32 set-meta stest.com AXFR-SOURCE 127.0.0.2
                        fi
                fi
        done

diff --git a/regression-tests/check_stest_source b/regression-tests/check_stest_source
index 270c0716ba02ac85058db64cd52fbf599fc0b9dc..4c43faa6e4992933dcade4d946272443a09594ab 100644 (file)
--- a/regression-tests/check_stest_source
+++ b/regression-tests/check_stest_source
@@ -1,7 +1,7 @@
 function prequery ( dnspacket )
   qname, qtype = dnspacket:getQuestion()
   remote = dnspacket:getRemote()
-  if qname == "stest.com" and remote ~= "127.0.0.2" then
+  if qname == "stest.com." and remote ~= "127.0.0.2" then
     dnspacket:setRcode(pdns.NXDOMAIN)
     return true
     end

diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop
index b11d6d2650c7ce51bbcb82f3a47cdb775dfc4bd1..c908da43f12135d8d152b1579d7b2e69b190090c 100755 (executable)
--- a/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@ -252,6 +252,7 @@ done
 
 rm -f pdns*.pid
 rm -f *_tests
+rm -f pdns-*.conf
 
 presigned=no
 both=no

diff --git a/regression-tests/tests/00dnssec-grabkeys/command b/regression-tests/tests/00dnssec-grabkeys/command
index e001f9b04f0b492e21659581021953d248d7e6e1..80eb7065a483dfe4bcca492e84c7b4df7bd882dd 100755 (executable)
--- a/regression-tests/tests/00dnssec-grabkeys/command
+++ b/regression-tests/tests/00dnssec-grabkeys/command
@@ -4,7 +4,7 @@ rm -f unbound-host.conf
 
 for zone in $(grep 'zone ' named.conf  | cut -f2 -d\")
 do
-       if [ "${zone: 0:16}" != "secure-delegated" ]
+       if [ "${zone: 0:16}" != "secure-delegated" ] && [ "$zone" != "stest.com" ]
        then
                drill -p $port -o rd -D dnskey $zone @$nameserver | grep $'DNSKEY\t257' | grep -v 'RRSIG' | grep -v '^;' | grep -v AwEAAarTiHhPgvD28WCN8UBXcEcf8f >> trustedkeys
        fi

diff --git a/regression-tests/tests/00dnssec-grabkeys/expected_result.dnssec b/regression-tests/tests/00dnssec-grabkeys/expected_result.dnssec
index b4de3947675361a7770d29b8982c407b0ec6b2a0..f599e28b8ab0d8c9c57a486c89c4a5132dcbd3b2 100644 (file)
--- a/regression-tests/tests/00dnssec-grabkeys/expected_result.dnssec
+++ b/regression-tests/tests/00dnssec-grabkeys/expected_result.dnssec
@@ -1 +1 @@
-11
+10