From b6072c012eb879c7955940ccb6f6376a0e88c2c0 Mon Sep 17 00:00:00 2001 From: Kees Monshouwer Date: Sat, 31 Dec 2016 22:04:00 +0100 Subject: [PATCH] nsec ent-asterisk test is no longer bogus with unbound 1.6.0 --- build-scripts/travis.sh | 6 ++++++ regression-tests/backends/bind-master | 2 +- regression-tests/backends/gsql-common | 2 +- regression-tests/tests/ent-asterisk/expected_result.dnssec | 1 - 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/build-scripts/travis.sh b/build-scripts/travis.sh index 3e0e40d73..8d1b9c93c 100755 --- 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 98aaaa72b..7a0088776 100644 --- 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 80e6bc748..451a09860 100644 --- 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 daee83b16..e3412a799 100644 --- 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)) -- 2.40.0