From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Thu, 14 Feb 2019 14:50:24 +0000 (+0100)
Subject: meson: tests/integration - turn off DNSSEC, add additional tests
X-Git-Tag: v4.0.0~24^2~120
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dbe52ef5b6450ea57db5b39c7cd007fdc88bf0ac;p=thirdparty%2Fknot-resolver.git

meson: tests/integration - turn off DNSSEC, add additional tests
---

diff --git a/modules/meson.build b/modules/meson.build
index 58ca2dfdb..576830757 100644
--- a/modules/meson.build
+++ b/modules/meson.build
@@ -26,6 +26,12 @@ config_tests += [
   ['dns64', files('dns64/dns64.test.lua')],
 ]
 
+integr_tests += [
+  ['bogus_log', join_paths(meson.current_source_dir(), 'bogus_log', 'test.integr')],
+  ['rebinding', join_paths(meson.current_source_dir(), 'rebinding', 'test.integr')],
+  ['serve_stale', join_paths(meson.current_source_dir(), 'serve_stale', 'test.integr')],
+]
+
 
 # handle more complex C/LUA modules separately
 subdir('bogus_log')
diff --git a/modules/policy/meson.build b/modules/policy/meson.build
index 076904bea..cea0f20a4 100644
--- a/modules/policy/meson.build
+++ b/modules/policy/meson.build
@@ -9,6 +9,7 @@ config_tests += [
 ]
 
 integr_tests += [
+  ['policy', join_paths(meson.current_source_dir(), 'test.integr')],
   ['policy.noipv6', join_paths(meson.current_source_dir(), 'noipv6.test.integr')],
   ['policy.noipvx', join_paths(meson.current_source_dir(), 'noipvx.test.integr')],
 ]
diff --git a/modules/policy/noipv6.test.integr/kresd_config.j2 b/modules/policy/noipv6.test.integr/kresd_config.j2
index 56cdb013c..f733557c6 100644
--- a/modules/policy/noipv6.test.integr/kresd_config.j2
+++ b/modules/policy/noipv6.test.integr/kresd_config.j2
@@ -2,6 +2,9 @@
 net.ipv6 = false
 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 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 4b5b576ca..0e39b90cb 100644
--- a/modules/policy/noipvx.test.integr/kresd_config.j2
+++ b/modules/policy/noipvx.test.integr/kresd_config.j2
@@ -3,6 +3,9 @@ net.ipv4 = false
 net.ipv6 = false
 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 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 92743631d..c460b6974 100644
--- a/modules/policy/test.integr/kresd_config.j2
+++ b/modules/policy/test.integr/kresd_config.j2
@@ -1,6 +1,9 @@
 {% raw %}
 policy.add(policy.suffix(policy.REFUSE, {todname('refuse.example.com')}))
 
+-- make sure DNSSEC is turned off for tests
+trust_anchors.keyfile_default = nil
+
 -- Disable RFC8145 signaling, scenario doesn't provide expected answers
 if ta_signal_query then
         modules.unload('ta_signal_query')
diff --git a/modules/rebinding/rebinding.lua b/modules/rebinding/rebinding.lua
index cc07bb1a4..1b1223c5a 100644
--- a/modules/rebinding/rebinding.lua
+++ b/modules/rebinding/rebinding.lua
@@ -1,6 +1,6 @@
 -- Protection from DNS rebinding attacks
 local kres = require('kres')
-local renumber = require('kres_module.renumber')
+local renumber = require('kres_modules.renumber')
 
 local M = {}
 M.layer = {}
diff --git a/modules/rebinding/test.integr/kresd_config.j2 b/modules/rebinding/test.integr/kresd_config.j2
index 742f8d3e4..c04ac9b2b 100644
--- a/modules/rebinding/test.integr/kresd_config.j2
+++ b/modules/rebinding/test.integr/kresd_config.j2
@@ -1,4 +1,7 @@
 {% raw %}
+-- make sure DNSSEC is turned off for tests
+trust_anchors.keyfile_default = nil
+
 -- 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 50f2b6f39..f73f47126 100644
--- a/modules/serve_stale/test.integr/kresd_config.j2
+++ b/modules/serve_stale/test.integr/kresd_config.j2
@@ -1,6 +1,9 @@
 {% raw %}
 modules = { 'serve_stale < cache' }
 
+-- make sure DNSSEC is turned off for tests
+trust_anchors.keyfile_default = nil
+
 -- Disable RFC8145 signaling, scenario doesn't provide expected answers
 if ta_signal_query then
         modules.unload('ta_signal_query')
diff --git a/modules/stats/meson.build b/modules/stats/meson.build
index 769b867aa..4cea87219 100644
--- a/modules/stats/meson.build
+++ b/modules/stats/meson.build
@@ -4,6 +4,11 @@ stats_src = [
   'stats.c',
 ]
 
+integr_tests += [
+  ['stats', join_paths(meson.current_source_dir(), 'test.integr')],
+]
+
+
 stats_mod = shared_module(
   'stats',
   stats_src,
diff --git a/modules/stats/test.integr/kresd_config.j2 b/modules/stats/test.integr/kresd_config.j2
index 22e4077ba..44e6a4dee 100644
--- a/modules/stats/test.integr/kresd_config.j2
+++ b/modules/stats/test.integr/kresd_config.j2
@@ -51,6 +51,9 @@ end
 policy.add(policy.pattern(reply_result, 'stats.test.'))
 policy.add(policy.all(FWD_TARGET)) -- avoid iteration
 
+-- make sure DNSSEC is turned off for tests
+trust_anchors.keyfile_default = nil
+
 -- 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 f56430a01..2837619bb 100644
--- a/modules/view/addr.test.integr/kresd_config.j2
+++ b/modules/view/addr.test.integr/kresd_config.j2
@@ -5,6 +5,9 @@ view:addr('127.0.0.0/24', policy.suffix(policy.DENY_MSG("addr 127.0.0.0/24 match
 view:addr('127.0.0.0/24', policy.suffix(policy.DENY_MSG("addr 127.0.0.0/24 matched net"),{"\3net\0"}))
 policy.add(policy.all(policy.FORWARD('1.2.3.4')))
 
+-- make sure DNSSEC is turned off for tests
+trust_anchors.keyfile_default = nil
+
 -- 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 6a0952e61..4b53ee36d 100644
--- a/modules/view/tsig.test.integr/kresd_config.j2
+++ b/modules/view/tsig.test.integr/kresd_config.j2
@@ -22,6 +22,9 @@ if detect_time_skew then
         modules.unload('detect_time_skew')
 end
 
+-- make sure DNSSEC is turned off for tests
+trust_anchors.keyfile_default = nil
+
 _hint_root_file('hints')
 cache.size = 2*MB
 verbose(true)
diff --git a/tests/integration/kresd_config.j2 b/tests/integration/kresd_config.j2
index 52814b506..abfe0760f 100644
--- a/tests/integration/kresd_config.j2
+++ b/tests/integration/kresd_config.j2
@@ -2,6 +2,9 @@ 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
 
 
diff --git a/tests/integration/meson.build b/tests/integration/meson.build
index 13cf02687..8dcc3b2b6 100644
--- a/tests/integration/meson.build
+++ b/tests/integration/meson.build
@@ -26,7 +26,6 @@ deckard_contrib = custom_target(
     '@0@'.format(join_paths(meson.current_source_dir(), 'deckard')),
   ],
   output: 'deckard_contrib',
-  build_always_stale: true,
 )
 
 deckard_env = environment()