From: Pavel Boldin <boldin.pavel@gmail.com>
Date: Fri, 6 Sep 2013 14:41:13 +0000 (+0400)
Subject: fix tests
X-Git-Tag: rec-3.6.0-rc1~456^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=32449be18bc66ab04271c755ac6e0ea7a290febe;p=pdns

fix tests
---

diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop
index 1dc6c9e0c..1ab42f3dc 100755
--- a/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@ -376,7 +376,8 @@ case $context in
 				--no-shuffle --launch=bind --bind-config=./named.conf                \
 				--send-root-referral    \
 				--allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \
-				--cache-ttl=$cachettl --no-config &
+				--cache-ttl=$cachettl --no-config \
+				--bind-ignore-broken-records=yes &
 			skipreasons="nodnssec nodyndns"
 			bindwait
 			;;
@@ -422,7 +423,8 @@ case $context in
 				--bind-dnssec-db=./dnssec.sqlite3 \
 				--send-root-referral \
 				--allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes --experimental-direct-dnskey=yes \
-				--cache-ttl=$cachettl --no-config &
+				--cache-ttl=$cachettl --no-config \
+				--bind-ignore-broken-records=yes &
 			bindwait
 			;;
 
diff --git a/regression-tests/verify-dnssec-zone/command b/regression-tests/verify-dnssec-zone/command
index ff2e54f4b..a3761bccc 100755
--- a/regression-tests/verify-dnssec-zone/command
+++ b/regression-tests/verify-dnssec-zone/command
@@ -1,5 +1,5 @@
 #!/bin/sh
-for zone in $(grep zone named.conf  | cut -f2 -d\" | grep -v '^example.com$')
+for zone in $(grep zone named.conf  | cut -f2 -d\" | grep -v '^\(example.com\|nztest.com\)$')
 do
 	TFILE=$(mktemp)
 	dig axfr $zone @$nameserver -p $port | ldns-read-zone -z > $TFILE
diff --git a/regression-tests/verify-dnssec-zone/expected_result b/regression-tests/verify-dnssec-zone/expected_result
index 1cd01b515..ce5da3377 100644
--- a/regression-tests/verify-dnssec-zone/expected_result
+++ b/regression-tests/verify-dnssec-zone/expected_result
@@ -46,21 +46,6 @@ zone wtest.com/IN: loaded serial 2005092501 (DNSSEC signed)
 OK
 RETVAL: 0
 
---- ldns-verify-zone -V2 nztest.com
-RETVAL: 0
-
---- validns nztest.com
-RETVAL: 0
-
---- jdnssec-verifyzone nztest.com
-zone verified.
-RETVAL: 0
-
---- named-checkzone nztest.com
-zone nztest.com/IN: loaded serial 2005092501 (DNSSEC signed)
-OK
-RETVAL: 0
-
 --- ldns-verify-zone -V2 dnssec-parent.com
 RETVAL: 0