From: Aki Tuomi <cmouse@cmouse.fi>
Date: Thu, 14 Jan 2016 06:54:13 +0000 (+0200)
Subject: Update tests to match changes
X-Git-Tag: dnsdist-1.0.0-alpha2~40^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f9e7ef78246659f1e6219187f4d54db7046ac3f3;p=pdns

Update tests to match changes
---

diff --git a/regression-tests.nobackend/supermaster-signed/command b/regression-tests.nobackend/supermaster-signed/command
index 7681ecd9f..b6f107914 100755
--- 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 d0ec878db..d41df0362 100644
--- 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 8aa1e1b96..96bd7e68c 100755
--- 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 ()