From: Kees Monshouwer <mind04@monshouwer.org>
Date: Sat, 12 Apr 2014 17:43:19 +0000 (+0200)
Subject: remove duplicate code from gsql-master test scripts
X-Git-Tag: rec-3.6.0-rc1~61^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7c3a8d60bc3c32f1d1ae997f49415c304f5bc01;p=thirdparty%2Fpdns.git

remove duplicate code from gsql-master test scripts
---

diff --git a/regression-tests/backends/gmysql-master b/regression-tests/backends/gmysql-master
index 3754619f36..1e1a0b18ab 100644
--- a/regression-tests/backends/gmysql-master
+++ b/regression-tests/backends/gmysql-master
@@ -1,3 +1,5 @@
+source ./backends/gsql-common
+
 case $context in
 	gmysql-nodnssec | gmysql | gmysql-nsec3 | gmysql-nsec3-optout | gmysql-nsec3-narrow)
 		[ -z "$GMYSQLDB" ] && GMYSQLDB=pdnstest
@@ -22,58 +24,7 @@ gmysql-host=$GMYSQLHOST
 gmysql-password=$GMYSQLPASSWD
 __EOF__
 
-		if [ $context != gmysql-nodnssec ]
-		then
-			echo "gmysql-dnssec" >> pdns-gmysql.conf
-		fi
-
-		for zone in $(grep 'zone ' named.conf  | cut -f2 -d\")
-		do
-			if [ $context != gmysql-nodnssec ]
-			then
-				securezone $zone gmysql
-				if [ $context = gmysql-nsec3 ] || [ $context = gmysql-nsec3-optout ]
-				then
-					../pdns/pdnssec --config-dir=. --config-name=gmysql set-nsec3 $zone "1 $optout 1 abcd" 2>&1
-					../pdns/pdnssec --config-dir=. --config-name=gmysql rectify-zone $zone 2>&1
-				elif [ $context = gmysql-nsec3-narrow ]
-				then
-					../pdns/pdnssec --config-dir=. --config-name=gmysql set-nsec3 $zone '1 1 1 abcd' narrow 2>&1
-					../pdns/pdnssec --config-dir=. --config-name=gmysql rectify-zone $zone 2>&1
-				fi
-			else
-				../pdns/pdnssec --config-dir=. --config-name=gmysql rectify-zone $zone 2>&1
-			fi
-		done
-
-		../pdns/pdnssec --config-dir=. --config-name=gmysql import-tsig-key test $ALGORITHM $KEY
-		../pdns/pdnssec --config-dir=. --config-name=gmysql activate-tsig-key tsig.com test master
-
-		$RUNWRAPPER $PDNS --daemon=no --local-port=$port --config-dir=. \
-			--config-name=gmysql  --socket-dir=./ --no-shuffle \
-			--send-root-referral \
-			--allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \
-			--cache-ttl=$cachettl --experimental-dname-processing $lua_prequery &
-
-		if [ $context = gmysql-nsec3 ]
-		then
-			extracontexts="dnssec nsec3"
-			skipreasons="nsec3"
-		elif [ $context = gmysql-nsec3-optout ]
-		then
-			extracontexts="dnssec nsec3 nsec3-optout"
-			skipreasons="optout"
-		elif [ $context = gmysql-nsec3-narrow ]
-		then
-			extracontexts="dnssec narrow"
-			skipreasons="narrow"
-		elif [ $context = gmysql-nodnssec ]
-		then
-			skipreasons="nodnssec"
-		else
-			extracontexts="dnssec"
-			skipreasons=""
-		fi
+		gsql-master gmysql
 		;;
 
 	*)
diff --git a/regression-tests/backends/goracle-master b/regression-tests/backends/goracle-master
index 7973160a37..265cecf6ad 100644
--- a/regression-tests/backends/goracle-master
+++ b/regression-tests/backends/goracle-master
@@ -1,3 +1,5 @@
+source ./backends/gsql-common
+
 case $context in
 	goracle-nodnssec | goracle | goracle-nsec3 | goracle-nsec3-optout | goracle-nsec3-narrow)
 		[ -z "$GORACLEUSER" ] && GORACLEUSER=pdns
@@ -18,58 +20,7 @@ goracle-user=$GORACLEUSER
 goracle-password=$GORACLEPASSWD
 __EOF__
 
-		if [ $context != goracle-nodnssec ]
-		then
-			echo "goracle-dnssec" >> pdns-goracle.conf
-		fi
-
-		for zone in $(grep 'zone ' named.conf  | cut -f2 -d\")
-		do
-			if [ $context != goracle-nodnssec ]
-			then
-				securezone $zone goracle
-				if [ $context = goracle-nsec3 ] || [ $context = goracle-nsec3-optout ]
-				then
-					../pdns/pdnssec --config-dir=. --config-name=goracle set-nsec3 $zone "1 $optout 1 abcd" 2>&1
-					../pdns/pdnssec --config-dir=. --config-name=goracle rectify-zone $zone 2>&1
-				elif [ $context = gmysql-nsec3-narrow ]
-				then
-					../pdns/pdnssec --config-dir=. --config-name=goracle set-nsec3 $zone '1 1 1 abcd' narrow 2>&1
-					../pdns/pdnssec --config-dir=. --config-name=goracle rectify-zone $zone 2>&1
-				fi
-			else
-				../pdns/pdnssec --config-dir=. --config-name=goracle rectify-zone $zone 2>&1
-			fi
-		done
-
-		../pdns/pdnssec --config-dir=. --config-name=goracle import-tsig-key test $ALGORITHM $KEY
-		../pdns/pdnssec --config-dir=. --config-name=goracle activate-tsig-key tsig.com test master
-
-		$RUNWRAPPER $PDNS --daemon=no --local-port=$port --config-dir=. \
-			--config-name=goracle --socket-dir=./ --no-shuffle \
-			--send-root-referral \
-			--allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \
-			--cache-ttl=$cachettl --experimental-dname-processing $lua_prequery &
-
-		if [ $context = goracle-nsec3 ]
-		then
-			extracontexts="dnssec nsec3"
-			skipreasons="nsec3 nodyndns"
-		elif [ $context = goracle-nsec3-optout ]
-		then
-			extracontexts="dnssec nsec3 nsec3-optout"
-			skipreasons="optout nodyndns"
-		elif [ $context = goracle-nsec3-narrow ]
-		then
-			extracontexts="dnssec narrow"
-			skipreasons="narrow nodyndns"
-		elif [ $context = goracle-nodnssec ]
-		then
-			skipreasons="nodnssec nodyndns"
-		else
-			extracontexts="dnssec"
-			skipreasons="nodyndns"
-		fi
+		gsql-master goracle nodyndns
 		;;
 
 	*)
diff --git a/regression-tests/backends/gpgsql-master b/regression-tests/backends/gpgsql-master
index 61f6acd6c1..63d3b81bb2 100644
--- a/regression-tests/backends/gpgsql-master
+++ b/regression-tests/backends/gpgsql-master
@@ -1,3 +1,5 @@
+source ./backends/gsql-common
+
 case $context in
 	gpgsql-nodnssec | gpgsql | gpgsql-nsec3 | gpgsql-nsec3-optout | gpgsql-nsec3-narrow)
 		[ -z "$GPGSQLDB" ] && GPGSQLDB=pdnstest
@@ -15,58 +17,7 @@ gpgsql-dbname=$GPGSQLDB
 gpgsql-user=$GPGSQLUSER
 __EOF__
 
-		if [ $context != gpgsql-nodnssec ]
-		then
-			echo "gpgsql-dnssec" >> pdns-gpgsql.conf
-		fi
-
-		for zone in $(grep 'zone ' named.conf  | cut -f2 -d\")
-		do
-			if [ $context != gpgsql-nodnssec ]
-			then
-				securezone $zone gpgsql
-				if [ $context = gpgsql-nsec3 ] || [ $context = gpgsql-nsec3-optout ]
-				then
-					../pdns/pdnssec --config-dir=. --config-name=gpgsql set-nsec3 $zone "1 $optout 1 abcd" 2>&1
-					../pdns/pdnssec --config-dir=. --config-name=gpgsql rectify-zone $zone 2>&1
-				elif [ $context = gpgsql-nsec3-narrow ]
-				then
-					../pdns/pdnssec --config-dir=. --config-name=gpgsql set-nsec3 $zone '1 1 1 abcd' narrow 2>&1
-					../pdns/pdnssec --config-dir=. --config-name=gpgsql rectify-zone $zone 2>&1
-				fi
-			else
-				../pdns/pdnssec --config-dir=. --config-name=gpgsql rectify-zone $zone 2>&1
-			fi
-		done
-
-		../pdns/pdnssec --config-dir=. --config-name=gpgsql import-tsig-key test $ALGORITHM $KEY
-		../pdns/pdnssec --config-dir=. --config-name=gpgsql activate-tsig-key tsig.com test master
-
-		$RUNWRAPPER $PDNS --daemon=no --local-port=$port --config-dir=. \
-			--config-name=gpgsql  --socket-dir=./ --no-shuffle \
-			--send-root-referral \
-			--allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \
-			--cache-ttl=$cachettl --experimental-dname-processing $lua_prequery &
-
-		if [ $context = gpgsql-nsec3 ]
-		then
-			extracontexts="dnssec nsec3"
-			skipreasons="nsec3 nodyndns"
-		elif [ $context = gpgsql-nsec3-optout ]
-		then
-			extracontexts="dnssec nsec3 nsec3-optout"
-			skipreasons="optout nodyndns"
-		elif [ $context = gpgsql-nsec3-narrow ]
-		then
-			extracontexts="dnssec narrow"
-			skipreasons="narrow nodyndns"
-		elif [ $context = gpgsql-nodnssec ]
-		then
-			skipreasons="nodnssec nodyndns"
-		else
-			extracontexts="dnssec"
-			skipreasons="nodyndns"
-		fi
+		gsql-master gpgsql nodyndns
 		;;
 
 	*)
diff --git a/regression-tests/backends/gsql-common b/regression-tests/backends/gsql-common
new file mode 100644
index 0000000000..300f4a8574
--- /dev/null
+++ b/regression-tests/backends/gsql-common
@@ -0,0 +1,58 @@
+gsql-master()
+{
+	backend=$1
+	skipreasons=$2
+
+	if [ $context != ${backend}-nodnssec ]
+	then
+		echo "${backend}-dnssec" >> pdns-${backend}.conf
+	fi
+
+	for zone in $(grep 'zone ' named.conf  | cut -f2 -d\")
+	do
+		if [ $context != ${backend}-nodnssec ]
+		then
+			securezone $zone ${backend}
+			if [ $context = ${backend}-nsec3 ] || [ $context = ${backend}-nsec3-optout ]
+			then
+				../pdns/pdnssec --config-dir=. --config-name=$backend set-nsec3 $zone "1 $optout 1 abcd" 2>&1
+				../pdns/pdnssec --config-dir=. --config-name=$backend rectify-zone $zone 2>&1
+			elif [ $context = ${backend}-nsec3-narrow ]
+			then
+				../pdns/pdnssec --config-dir=. --config-name=$backend set-nsec3 $zone '1 1 1 abcd' narrow 2>&1
+				../pdns/pdnssec --config-dir=. --config-name=$backend rectify-zone $zone 2>&1
+			fi
+		else
+			../pdns/pdnssec --config-dir=. --config-name=$backend rectify-zone $zone 2>&1
+		fi
+	done
+
+	../pdns/pdnssec --config-dir=. --config-name=$backend import-tsig-key test $ALGORITHM $KEY
+	../pdns/pdnssec --config-dir=. --config-name=$backend activate-tsig-key tsig.com test master
+
+	$RUNWRAPPER $PDNS --daemon=no --local-port=$port --config-dir=. \
+		--config-name=$backend --socket-dir=./ --no-shuffle \
+		--send-root-referral \
+		--allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \
+		--cache-ttl=$cachettl --experimental-dname-processing $lua_prequery &
+
+	if [ $context = ${backend}-nsec3 ]
+	then
+		extracontexts="dnssec nsec3"
+		skipreasons="$skipreasons nsec3"
+	elif [ $context = ${backend}-nsec3-optout ]
+	then
+		extracontexts="dnssec nsec3 nsec3-optout"
+		skipreasons="$skipreasons optout"
+	elif [ $context = ${backend}-nsec3-narrow ]
+	then
+		extracontexts="dnssec narrow"
+		skipreasons="$skipreasons narrow"
+	elif [ $context = ${backend}-nodnssec ]
+	then
+		skipreasons="$skipreasons nodnssec"
+	else
+		extracontexts="dnssec"
+		skipreasons="$skipreasons"
+	fi
+}
diff --git a/regression-tests/backends/gsqlite3-master b/regression-tests/backends/gsqlite3-master
index 7da351f003..0f02cc8e4c 100644
--- a/regression-tests/backends/gsqlite3-master
+++ b/regression-tests/backends/gsqlite3-master
@@ -1,3 +1,5 @@
+source ./backends/gsql-common
+
 case $context in
 	gsqlite3-nodnssec | gsqlite3 | gsqlite3-nsec3 | gsqlite3-nsec3-optout | gsqlite3-nsec3-narrow)
 		rm -f pdns.sqlite3
@@ -10,58 +12,7 @@ launch=gsqlite3
 gsqlite3-database=pdns.sqlite3
 __EOF__
 
-		if [ $context != gsqlite3-nodnssec ]
-		then
-			echo "gsqlite3-dnssec" >> pdns-gsqlite3.conf
-		fi
-
-		for zone in $(grep 'zone ' named.conf  | cut -f2 -d\")
-		do
-			if [ $context != gsqlite3-nodnssec ]
-			then
-				securezone $zone gsqlite3
-				if [ $context = gsqlite3-nsec3 ] || [ $context = gsqlite3-nsec3-optout ]
-				then
-					../pdns/pdnssec --config-dir=. --config-name=gsqlite3 set-nsec3 $zone "1 $optout 1 abcd" 2>&1
-					../pdns/pdnssec --config-dir=. --config-name=gsqlite3 rectify-zone $zone 2>&1
-				elif [ $context = gsqlite3-nsec3-narrow ]
-				then
-					../pdns/pdnssec --config-dir=. --config-name=gsqlite3 set-nsec3 $zone '1 1 1 abcd' narrow 2>&1
-					../pdns/pdnssec --config-dir=. --config-name=gsqlite3 rectify-zone $zone 2>&1
-				fi
-			else
-				../pdns/pdnssec --config-dir=. --config-name=gsqlite3 rectify-zone $zone 2>&1
-			fi
-		done
-
-		../pdns/pdnssec --config-dir=. --config-name=gsqlite3 import-tsig-key test $ALGORITHM $KEY
-		../pdns/pdnssec --config-dir=. --config-name=gsqlite3 activate-tsig-key tsig.com test master
-
-		$RUNWRAPPER $PDNS --daemon=no --local-port=$port --config-dir=. \
-			--config-name=gsqlite3  --socket-dir=./ --no-shuffle \
-			--send-root-referral \
-			--allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \
-			--cache-ttl=$cachettl --experimental-dname-processing $lua_prequery &
-
-		if [ $context = gsqlite3-nsec3 ]
-		then
-			extracontexts="dnssec nsec3"
-			skipreasons="nsec3 nodyndns"
-		elif [ $context = gsqlite3-nsec3-optout ]
-		then
-			extracontexts="dnssec nsec3 nsec3-optout"
-			skipreasons="optout nodyndns"
-		elif [ $context = gsqlite3-nsec3-narrow ]
-		then
-			extracontexts="dnssec narrow"
-			skipreasons="narrow nodyndns"
-		elif [ $context = gsqlite3-nodnssec ]
-		then
-			skipreasons="nodnssec nodyndns"
-		else
-			extracontexts="dnssec"
-			skipreasons="nodyndns"
-		fi
+		gsql-master gsqlite3 nodyndns
 		;;
 
 	*)