From: Matthijs Mekking Date: Thu, 31 Jul 2025 14:51:37 +0000 (+0200) Subject: Fix views system test X-Git-Tag: v9.21.17~60^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67ea0e656b9267075773a35d265fde809da0e092;p=thirdparty%2Fbind9.git Fix views system test This test case enables DNSSEC and has a mismatch in policy. Fix the policy so that it matches the existing key set, and adjust the expected answer count because no longer a new key is generated. --- diff --git a/bin/tests/system/views/ns2/named1.conf.in b/bin/tests/system/views/ns2/named1.conf.in index 4fd3ee55013..72e4ab4ff1d 100644 --- a/bin/tests/system/views/ns2/named1.conf.in +++ b/bin/tests/system/views/ns2/named1.conf.in @@ -37,7 +37,7 @@ controls { dnssec-policy "views" { keys { ksk key-directory lifetime unlimited algorithm @DEFAULT_ALGORITHM@; - csk key-directory lifetime unlimited algorithm @DEFAULT_ALGORITHM@; + zsk key-directory lifetime unlimited algorithm @DEFAULT_ALGORITHM@; }; }; diff --git a/bin/tests/system/views/ns2/named2.conf.in b/bin/tests/system/views/ns2/named2.conf.in index de312f10a5e..c39aab1276a 100644 --- a/bin/tests/system/views/ns2/named2.conf.in +++ b/bin/tests/system/views/ns2/named2.conf.in @@ -37,7 +37,7 @@ controls { dnssec-policy "views" { keys { ksk key-directory lifetime unlimited algorithm @DEFAULT_ALGORITHM@; - csk key-directory lifetime unlimited algorithm @DEFAULT_ALGORITHM@; + zsk key-directory lifetime unlimited algorithm @DEFAULT_ALGORITHM@; }; }; diff --git a/bin/tests/system/views/tests.sh b/bin/tests/system/views/tests.sh index 4684f82249b..d7a20aa12d7 100644 --- a/bin/tests/system/views/tests.sh +++ b/bin/tests/system/views/tests.sh @@ -137,8 +137,8 @@ ret=0 wait_for_signed() { "$DIG" -p "${PORT}" @10.53.0.2 -b 10.53.0.2 +dnssec DNSKEY inline >dig.out.internal "$DIG" -p "${PORT}" @10.53.0.2 -b 10.53.0.5 +dnssec DNSKEY inline >dig.out.external - grep "ANSWER: 4," dig.out.internal >/dev/null || return 1 - grep "ANSWER: 4," dig.out.external >/dev/null || return 1 + grep "ANSWER: 3," dig.out.internal >/dev/null || return 1 + grep "ANSWER: 3," dig.out.external >/dev/null || return 1 return 0 } retry_quiet 10 wait_for_signed || ret=1