From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Wed, 13 Mar 2019 11:51:14 +0000 (+0100)
Subject: tests/integration: update kresd config for deckard
X-Git-Tag: v4.0.0~15^2~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1651125a96f2faf475cd651a3004c35654ac0c6a;p=thirdparty%2Fknot-resolver.git

tests/integration: update kresd config for deckard
---

diff --git a/modules/bogus_log/test.integr/kresd_config.j2 b/modules/bogus_log/test.integr/kresd_config.j2
index bf4b1e85f..061c84170 100644
--- a/modules/bogus_log/test.integr/kresd_config.j2
+++ b/modules/bogus_log/test.integr/kresd_config.j2
@@ -34,6 +34,11 @@ function reply_result(state, req)
 end
 policy.add(policy.pattern(reply_result, 'bogus_log.test.'))
 
+-- Disable RFC5011 TA update
+if ta_update then
+        modules.unload('ta_update')
+end
+
 -- Disable RFC8145 signaling, scenario doesn't provide expected answers
 if ta_signal_query then
         modules.unload('ta_signal_query')
diff --git a/modules/policy/noipv6.test.integr/kresd_config.j2 b/modules/policy/noipv6.test.integr/kresd_config.j2
index 5648d81ee..4d9a26149 100644
--- a/modules/policy/noipv6.test.integr/kresd_config.j2
+++ b/modules/policy/noipv6.test.integr/kresd_config.j2
@@ -5,6 +5,11 @@ policy.add(policy.all(policy.STUB({ '::1:2:3:4', '1.2.3.4' })))
 -- make sure DNSSEC is turned off for tests
 trust_anchors.keyfile_default = nil
 
+-- Disable RFC5011 TA update
+if ta_update then
+        modules.unload('ta_update')
+end
+
 -- Disable RFC8145 signaling, scenario doesn't provide expected answers
 if ta_signal_query then
         modules.unload('ta_signal_query')
diff --git a/modules/policy/noipvx.test.integr/kresd_config.j2 b/modules/policy/noipvx.test.integr/kresd_config.j2
index 9ee7afd2f..6b12bb25d 100644
--- a/modules/policy/noipvx.test.integr/kresd_config.j2
+++ b/modules/policy/noipvx.test.integr/kresd_config.j2
@@ -6,6 +6,11 @@ policy.add(policy.all(policy.STUB({ '::1:2:3:4', '1.2.3.4' })))
 -- make sure DNSSEC is turned off for tests
 trust_anchors.keyfile_default = nil
 
+-- Disable RFC5011 TA update
+if ta_update then
+        modules.unload('ta_update')
+end
+
 -- Disable RFC8145 signaling, scenario doesn't provide expected answers
 if ta_signal_query then
         modules.unload('ta_signal_query')
diff --git a/modules/policy/test.integr/kresd_config.j2 b/modules/policy/test.integr/kresd_config.j2
index 5ad54fea4..cb5716aa0 100644
--- a/modules/policy/test.integr/kresd_config.j2
+++ b/modules/policy/test.integr/kresd_config.j2
@@ -4,6 +4,11 @@ policy.add(policy.suffix(policy.REFUSE, {todname('refuse.example.com')}))
 -- make sure DNSSEC is turned off for tests
 trust_anchors.keyfile_default = nil
 
+-- Disable RFC5011 TA update
+if ta_update then
+        modules.unload('ta_update')
+end
+
 -- Disable RFC8145 signaling, scenario doesn't provide expected answers
 if ta_signal_query then
         modules.unload('ta_signal_query')
diff --git a/modules/rebinding/test.integr/kresd_config.j2 b/modules/rebinding/test.integr/kresd_config.j2
index 39bc957bd..99919a31b 100644
--- a/modules/rebinding/test.integr/kresd_config.j2
+++ b/modules/rebinding/test.integr/kresd_config.j2
@@ -2,6 +2,11 @@
 -- make sure DNSSEC is turned off for tests
 trust_anchors.keyfile_default = nil
 
+-- Disable RFC5011 TA update
+if ta_update then
+        modules.unload('ta_update')
+end
+
 -- Disable RFC8145 signaling, scenario doesn't provide expected answers
 if ta_signal_query then
         modules.unload('ta_signal_query')
diff --git a/modules/serve_stale/test.integr/kresd_config.j2 b/modules/serve_stale/test.integr/kresd_config.j2
index b9a242c22..b0350cbca 100644
--- a/modules/serve_stale/test.integr/kresd_config.j2
+++ b/modules/serve_stale/test.integr/kresd_config.j2
@@ -4,6 +4,11 @@ modules = { 'serve_stale < cache' }
 -- make sure DNSSEC is turned off for tests
 trust_anchors.keyfile_default = nil
 
+-- Disable RFC5011 TA update
+if ta_update then
+        modules.unload('ta_update')
+end
+
 -- Disable RFC8145 signaling, scenario doesn't provide expected answers
 if ta_signal_query then
         modules.unload('ta_signal_query')
diff --git a/modules/stats/test.integr/kresd_config.j2 b/modules/stats/test.integr/kresd_config.j2
index b8fd49816..1ee2780b8 100644
--- a/modules/stats/test.integr/kresd_config.j2
+++ b/modules/stats/test.integr/kresd_config.j2
@@ -54,6 +54,11 @@ policy.add(policy.all(FWD_TARGET)) -- avoid iteration
 -- make sure DNSSEC is turned off for tests
 trust_anchors.keyfile_default = nil
 
+-- Disable RFC5011 TA update
+if ta_update then
+        modules.unload('ta_update')
+end
+
 -- Disable RFC8145 signaling, scenario doesn't provide expected answers
 if ta_signal_query then
         modules.unload('ta_signal_query')
diff --git a/modules/view/addr.test.integr/kresd_config.j2 b/modules/view/addr.test.integr/kresd_config.j2
index a92c14234..d9052875c 100644
--- a/modules/view/addr.test.integr/kresd_config.j2
+++ b/modules/view/addr.test.integr/kresd_config.j2
@@ -8,6 +8,11 @@ policy.add(policy.all(policy.FORWARD('1.2.3.4')))
 -- make sure DNSSEC is turned off for tests
 trust_anchors.keyfile_default = nil
 
+-- Disable RFC5011 TA update
+if ta_update then
+        modules.unload('ta_update')
+end
+
 -- Disable RFC8145 signaling, scenario doesn't provide expected answers
 if ta_signal_query then
         modules.unload('ta_signal_query')
diff --git a/modules/view/tsig.test.integr/kresd_config.j2 b/modules/view/tsig.test.integr/kresd_config.j2
index 9ce0162c0..e69799be0 100644
--- a/modules/view/tsig.test.integr/kresd_config.j2
+++ b/modules/view/tsig.test.integr/kresd_config.j2
@@ -7,6 +7,11 @@ view:tsig('\8testkey1\0', policy.suffix(policy.DENY_MSG("TSIG key testkey1 match
 view:tsig('\7testkey\0', policy.suffix(policy.DENY_MSG("TSIG key testkey matched example"),{"\7example\0"}))
 policy.add(policy.all(policy.FORWARD('1.2.3.4')))
 
+-- Disable RFC5011 TA update
+if ta_update then
+        modules.unload('ta_update')
+end
+
 -- Disable RFC8145 signaling, scenario doesn't provide expected answers
 if ta_signal_query then
         modules.unload('ta_signal_query')
diff --git a/tests/integration/kresd_config.j2 b/tests/integration/kresd_config.j2
deleted file mode 100644
index d7f4cfb66..000000000
--- a/tests/integration/kresd_config.j2
+++ /dev/null
@@ -1,56 +0,0 @@
-net = { '{{SELF_ADDR}}' }
--- hints.root({['k.root-servers.net'] = '{{ROOT_ADDR}}'})
-_hint_root_file('hints')
-
--- make sure DNSSEC is turned off for tests
-trust_anchors.keyfile_default = nil
-
-cache.size = 2*MB
-
-
-{% if QMIN == "false" %}
-option('NO_MINIMIZE', true)
-{% else %}
-option('NO_MINIMIZE', false)
-{% endif %}
-
-{% if DO_NOT_QUERY_LOCALHOST == "false" %}
-option('ALLOW_LOCAL', true)
-{% else %}
-option('ALLOW_LOCAL', false)
-{% endif %}
-
-{% if HARDEN_GLUE == "true" %}
-mode('normal')
-{% else %}
-mode('permissive')
-{% endif %}
-
-{% for TAF in TRUST_ANCHOR_FILES %}
-trust_anchors.add_file('{{TAF}}')
-{% endfor %}
-trust_anchors.set_insecure({
-
-{% for DI in NEGATIVE_TRUST_ANCHORS %}
-"{{DI}}",
-{% endfor %}
-})
-
-verbose(true)
-
--- Self-checks on globals
-assert(help() ~= nil)
-assert(worker.id ~= nil)
--- Self-checks on facilities
-assert(cache.count() == 0)
-assert(cache.stats() ~= nil)
-assert(cache.backends() ~= nil)
-assert(worker.stats() ~= nil)
-assert(net.interfaces() ~= nil)
--- Self-checks on loaded stuff
-assert(net.list()[1].ip == '{{SELF_ADDR}}')
-assert(#modules.list() > 0)
--- Self-check timers
-ev = event.recurrent(1 * sec, function (ev) return 1 end)
-event.cancel(ev)
-ev = event.after(0, function (ev) return 1 end)
diff --git a/tests/pytests/templates/kresd.conf.j2 b/tests/pytests/templates/kresd.conf.j2
index 141f4389a..6e16b1072 100644
--- a/tests/pytests/templates/kresd.conf.j2
+++ b/tests/pytests/templates/kresd.conf.j2
@@ -44,6 +44,7 @@ policy.add(policy.suffix(policy.PASS, {todname('test.')}))
 
 -- make sure DNSSEC is turned off for tests
 trust_anchors.keyfile_default = nil
+modules.unload("ta_update")
 modules.unload("ta_signal_query")
 modules.unload("priming")
 modules.unload("detect_time_skew")