Update tests to match changes

diff --git a/regression-tests.nobackend/supermaster-signed/command b/regression-tests.nobackend/supermaster-signed/command
index 7681ecd9f99e19fb10d31dcb0b960fd5f32c48cf..b6f107914250f1a686f8598977fdf059f77bbe57 100755 (executable)
--- a/regression-tests.nobackend/supermaster-signed/command
+++ b/regression-tests.nobackend/supermaster-signed/command
@@ -91,8 +91,8 @@ start_master()
 {
         $RUNWRAPPER $PDNS --daemon=no --local-port=$port --config-dir=. --module-dir=../regression-tests/modules \
                 --config-name=gsqlite3-master --socket-dir=./ --no-shuffle \
-                --send-root-referral --master=yes --local-address=127.0.0.1 \
-                --query-local-address=127.0.0.1 --cache-ttl=$cachettl --experimental-dname-processing --allow-axfr-ips= &
+                --send-root-referral --master=yes --local-address=127.0.0.1 --local-ipv6='' \
+                --query-local-address=127.0.0.1 --cache-ttl=$cachettl --dname-processing --allow-axfr-ips= &
 }
 
 start_slave()
@@ -100,7 +100,7 @@ start_slave()
         slaveport=53
 
         $RUNWRAPPER $PDNS2 --daemon=no --local-port=$slaveport --config-dir=. --module-dir=../regression-tests/modules \
-                --config-name=gsqlite3-slave --socket-dir=./ --no-shuffle --local-address=127.0.0.2 \
+                --config-name=gsqlite3-slave --socket-dir=./ --no-shuffle --local-address=127.0.0.2 --local-ipv6='' \
                 --send-root-referral --slave --retrieval-threads=4 --slave=yes --query-local-address=127.0.0.2 \
                 --slave-cycle-interval=300 --allow-unsigned-notify=no --allow-unsigned-supermaster=no &
 }

diff --git a/regression-tests.nobackend/supermaster-signed/expected_result b/regression-tests.nobackend/supermaster-signed/expected_result
index d0ec878db1c66aecf2ab0ad24a3ff7eb9d9e272a..d41df036273daf6a1275041c578f4a7f64083ad7 100644 (file)
--- a/regression-tests.nobackend/supermaster-signed/expected_result
+++ b/regression-tests.nobackend/supermaster-signed/expected_result
@@ -1,5 +1,5 @@
-Imported TSIG key tsig.com hmac-md5
-Imported TSIG key tsig.com hmac-md5
+Imported TSIG key tsig.com. hmac-md5
+Imported TSIG key tsig.com. hmac-md5
 Set 'example.com' meta TSIG-ALLOW-AXFR = tsig.com
 Set 'test.com' meta TSIG-ALLOW-AXFR = tsig.com
 Set 'example.com' meta AXFR-MASTER-TSIG = tsig.com

diff --git a/regression-tests.nobackend/supermaster-unsigned/command b/regression-tests.nobackend/supermaster-unsigned/command
index 8aa1e1b96cecd918847318731ed9b4dd3127375e..96bd7e68c3b637bbe30d6867cda0812eafc7b856 100755 (executable)
--- a/regression-tests.nobackend/supermaster-unsigned/command
+++ b/regression-tests.nobackend/supermaster-unsigned/command
@@ -81,8 +81,8 @@ start_master()
 {
         $RUNWRAPPER $PDNS --daemon=no --local-port=$port --config-dir=. --module-dir=../regression-tests/modules \
                 --config-name=gsqlite3-master --socket-dir=./ --no-shuffle \
-                --send-root-referral --master=yes --local-address=127.0.0.1 \
-                --query-local-address=127.0.0.1 --cache-ttl=$cachettl --experimental-dname-processing --allow-axfr-ips= &
+                --send-root-referral --master=yes --local-address=127.0.0.1 --local-ipv6= \
+                --query-local-address=127.0.0.1 --cache-ttl=$cachettl --dname-processing --allow-axfr-ips= &
 }
 
 start_slave()
@@ -90,9 +90,9 @@ start_slave()
         slaveport=53
 
         $RUNWRAPPER $PDNS2 --daemon=no --local-port=$slaveport --config-dir=. --module-dir=../regression-tests/modules \
-                --config-name=gsqlite3-slave --socket-dir=./ --no-shuffle --local-address=127.0.0.2 \
+                --config-name=gsqlite3-slave --socket-dir=./ --no-shuffle --local-address=127.0.0.2 --local-ipv6= \
                 --send-root-referral --slave --retrieval-threads=4 --slave=yes --query-local-address=127.0.0.2 \
-                --slave-cycle-interval=300 --experimental-dname-processing &
+                --slave-cycle-interval=300 --dname-processing &
 }
 
 check_process ()