From: Kees Monshouwer <mind04@monshouwer.org>
Date: Wed, 26 May 2021 21:43:52 +0000 (+0200)
Subject: auth: test with a variety of zone-cache-refresh-interval flavors
X-Git-Tag: auth-4.5.0-beta1~5^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a796f45037b7a93b331419ebb64e39cf1c57e822;p=thirdparty%2Fpdns.git

auth: test with a variety of zone-cache-refresh-interval flavors
---

diff --git a/regression-tests/backends/bind-master b/regression-tests/backends/bind-master
index 1c403feced..d32a3cce32 100644
--- a/regression-tests/backends/bind-master
+++ b/regression-tests/backends/bind-master
@@ -44,6 +44,7 @@ gmysql-user=$GMYSQLUSER
 gmysql-host=$GMYSQLHOST
 gmysql-password=$GMYSQLPASSWD
 gmysql-dnssec
+zone-cache-refresh-interval=0
 __EOF__
         else
             echo "bind-dnssec-db=./dnssec.sqlite3" >> pdns-bind.conf
diff --git a/regression-tests/backends/gmysql-master b/regression-tests/backends/gmysql-master
index a0f084926a..8a31c1c242 100644
--- a/regression-tests/backends/gmysql-master
+++ b/regression-tests/backends/gmysql-master
@@ -25,6 +25,7 @@ gmysql-host=$GMYSQLHOST
 gmysql-password=$GMYSQLPASSWD
 
 any-to-tcp=no
+zone-cache-refresh-interval=0
 __EOF__
 
 		gsql_master gmysql dyndns
diff --git a/regression-tests/backends/gmysql-slave b/regression-tests/backends/gmysql-slave
index ec9757c21e..e4dd2e6417 100644
--- a/regression-tests/backends/gmysql-slave
+++ b/regression-tests/backends/gmysql-slave
@@ -18,6 +18,8 @@ gmysql-dbname=$GMYSQL2DB
 gmysql-user=$GMYSQL2USER
 gmysql-host=$GMYSQL2HOST
 gmysql-password=$GMYSQL2PASSWD
+
+zone-cache-refresh-interval=0
 __EOF__
 
 	if [[ $context != *nodnssec* ]]
diff --git a/regression-tests/backends/gpgsql-master b/regression-tests/backends/gpgsql-master
index 9618700881..4f2fa3ef05 100644
--- a/regression-tests/backends/gpgsql-master
+++ b/regression-tests/backends/gpgsql-master
@@ -16,6 +16,8 @@ module-dir=./modules
 launch=gpgsql
 gpgsql-dbname=$GPGSQLDB
 gpgsql-user=$GPGSQLUSER
+
+zone-cache-refresh-interval=120
 __EOF__
 
 		gsql_master gpgsql nodyndns
diff --git a/regression-tests/backends/gpgsql-slave b/regression-tests/backends/gpgsql-slave
index b7ca8beb50..7c727266ee 100644
--- a/regression-tests/backends/gpgsql-slave
+++ b/regression-tests/backends/gpgsql-slave
@@ -11,6 +11,8 @@ module-dir=./modules
 launch=gpgsql
 gpgsql-dbname=$GPGSQL2DB
 gpgsql-user=$GPGSQL2USER
+
+zone-cache-refresh-interval=120
 __EOF__
 
 	if [[ $context != *nodnssec* ]]
diff --git a/regression-tests/backends/ldap-master b/regression-tests/backends/ldap-master
index 791e38a764..cb7047e2d4 100644
--- a/regression-tests/backends/ldap-master
+++ b/regression-tests/backends/ldap-master
@@ -29,9 +29,9 @@ __EOF__
 		$RUNWRAPPER $PDNS --daemon=no --local-address=$address --local-port=$port --config-dir=. \
 			--config-name=ldap --socket-dir=./ --no-shuffle \
 			--query-logging --dnsupdate=yes \
-      --expand-alias=yes --outgoing-axfr-expand-alias=yes \
-      --resolver=$RESOLVERIP \
-      --zone-cache-refresh-interval=0 \
+			--expand-alias=yes --outgoing-axfr-expand-alias=yes \
+			--resolver=$RESOLVERIP \
+			--zone-cache-refresh-interval=0 \
 			--cache-ttl=$cachettl --dname-processing $lua_prequery &
 
 		skipreasons="nodnssec noent nodyndns nometa noaxfr"
diff --git a/regression-tests/backends/remote-master b/regression-tests/backends/remote-master
index 3aeecf9f2e..774568b3b1 100644
--- a/regression-tests/backends/remote-master
+++ b/regression-tests/backends/remote-master
@@ -113,7 +113,7 @@ EOF
 			--no-shuffle --launch=remote \
 			--cache-ttl=$cachettl --dname-processing --no-config \
 			--distributor-threads=1 \
-			--dnsupdate=yes \
+			--dnsupdate=yes --zone-cache-refresh-interval=0 \
 			--remote-connection-string="$connstr" $remote_add_param --module-dir=./modules &
 		;;