nsec ent-asterisk test is no longer bogus with unbound 1.6.0

diff --git a/build-scripts/travis.sh b/build-scripts/travis.sh
index 3e0e40d739f622b8055aba418a6a322a2477a5f0..8d1b9c93cec3c65ad7a6959d1c929f4030cbde3e 100755 (executable)
--- a/build-scripts/travis.sh
+++ b/build-scripts/travis.sh
@@ -440,6 +440,9 @@ test_auth() {
 
   run "cd regression-tests"
 
+  #travis unbound is too old for this test (unbound 1.6.0 required)
+  run "touch tests/ent-asterisk/fail.nsec"
+
   run "./timestamp ./start-test-stop 5300 ldap-tree"
   run "./timestamp ./start-test-stop 5300 ldap-simple"
   run "./timestamp ./start-test-stop 5300 ldap-strict"
@@ -491,6 +494,9 @@ test_auth() {
   run "./timestamp ./start-test-stop 5300 remotebackend-zeromq-dnssec"
 
   run "./timestamp ./start-test-stop 5300 tinydns"
+
+  run "rm tests/ent-asterisk/fail.nsec"
+
   run "cd .."
 
   run "cd regression-tests.rootzone"

diff --git a/regression-tests/backends/bind-master b/regression-tests/backends/bind-master
index 98aaaa72bea224107e610252c31d028b63ea8c78..7a0088776cd0076cca16cedf61fdcf9ae32a161f 100644 (file)
--- a/regression-tests/backends/bind-master
+++ b/regression-tests/backends/bind-master
@@ -85,7 +85,7 @@ __EOF__
                        skipreasons="narrow nodyndns noalias"
                else
                        extracontexts="bind dnssec"
-                       skipreasons="nodyndns noalias"
+                       skipreasons="nodyndns noalias nsec"
                fi
 
                $RUNWRAPPER $PDNS --daemon=no --local-port=$port --config-dir=. \

diff --git a/regression-tests/backends/gsql-common b/regression-tests/backends/gsql-common
index 80e6bc74887941fd6683cd2d3dc0d7b1f7755617..451a0986039b7e913c528c2fab493617dd6c24f5 100644 (file)
--- a/regression-tests/backends/gsql-common
+++ b/regression-tests/backends/gsql-common
@@ -58,6 +58,6 @@ gsql_master()
                skipreasons="$skipreasons nodnssec"
        else
                extracontexts="dnssec"
-               skipreasons="$skipreasons"
+               skipreasons="$skipreasons nsec"
        fi
 }

diff --git a/regression-tests/tests/ent-asterisk/expected_result.dnssec b/regression-tests/tests/ent-asterisk/expected_result.dnssec
index daee83b162a46814b99bc2f9d7b7745b59d16b67..e3412a799ea5010938a4e0cfca05f15a3fc60d12 100644 (file)
--- a/regression-tests/tests/ent-asterisk/expected_result.dnssec
+++ b/regression-tests/tests/ent-asterisk/expected_result.dnssec
@@ -7,4 +7,3 @@
 2      .       IN      OPT     32768   
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='sub.host.sub.example.com.', qtype=A
-./tests/ent-asterisk/unbound-host.out:sub.host.sub.example.com has no address (BOGUS (security failure))