From: Kees Monshouwer <mind04@monshouwer.org>
Date: Fri, 22 Jul 2016 17:50:51 +0000 (+0200)
Subject: fix AXFR-SOURCE tests
X-Git-Tag: auth-4.0.1~21^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=52011cd7be107dfdfe33a37b8ea5d966a57524f7;p=thirdparty%2Fpdns.git

fix AXFR-SOURCE tests
---

diff --git a/regression-tests/backends/godbc_mssql-slave b/regression-tests/backends/godbc_mssql-slave
index 8a16b1bc66..4b7b02ddb7 100644
--- 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 21447683f2..448fb7b13a 100644
--- 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 bbeb81298f..b7ca8beb50 100644
--- 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 cfa7ffaa76..695644cb36 100644
--- 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 270c0716ba..4c43faa6e4 100644
--- 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 b11d6d2650..c908da43f1 100755
--- 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 e001f9b04f..80eb7065a4 100755
--- 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 b4de394767..f599e28b8a 100644
--- a/regression-tests/tests/00dnssec-grabkeys/expected_result.dnssec
+++ b/regression-tests/tests/00dnssec-grabkeys/expected_result.dnssec
@@ -1 +1 @@
-11
+10