tests: adapt to change of net.list() output

diff --git a/modules/bogus_log/test.integr/kresd_config.j2 b/modules/bogus_log/test.integr/kresd_config.j2
index 6e3dc09ee0128294d187c1eb4b74731167dccdf4..bf4b1e85f4d542238e212d7c64a11c2068452917 100644 (file)
--- a/modules/bogus_log/test.integr/kresd_config.j2
+++ b/modules/bogus_log/test.integr/kresd_config.j2
@@ -74,7 +74,7 @@ assert(cache.backends() ~= nil)
 assert(worker.stats() ~= nil)
 assert(net.interfaces() ~= nil)
 -- Self-checks on loaded stuff
-assert(net.list()['{{SELF_ADDR}}'])
+assert(net.list()[1].ip == '{{SELF_ADDR}}')
 assert(#modules.list() > 0)
 -- Self-check timers
 ev = event.recurrent(1 * sec, function (ev) return 1 end)

diff --git a/modules/policy/noipv6.test.integr/kresd_config.j2 b/modules/policy/noipv6.test.integr/kresd_config.j2
index f733557c63b5f831268779938b7da69aae97a609..5648d81eed750332f8b5a2190545f9e92d30a8f9 100644 (file)
--- a/modules/policy/noipv6.test.integr/kresd_config.j2
+++ b/modules/policy/noipv6.test.integr/kresd_config.j2
@@ -45,7 +45,7 @@ assert(cache.backends() ~= nil)
 assert(worker.stats() ~= nil)
 assert(net.interfaces() ~= nil)
 -- Self-checks on loaded stuff
-assert(net.list()['{{SELF_ADDR}}'])
+assert(net.list()[1].ip == '{{SELF_ADDR}}')
 assert(#modules.list() > 0)
 -- Self-check timers
 ev = event.recurrent(1 * sec, function (ev) return 1 end)

diff --git a/modules/policy/noipvx.test.integr/kresd_config.j2 b/modules/policy/noipvx.test.integr/kresd_config.j2
index 0e39b90cba31c9149fc1b2e944483ee06b98c468..9ee7afd2fb53b6bc7fee31c11a95574fcccf77cc 100644 (file)
--- a/modules/policy/noipvx.test.integr/kresd_config.j2
+++ b/modules/policy/noipvx.test.integr/kresd_config.j2
@@ -46,7 +46,7 @@ assert(cache.backends() ~= nil)
 assert(worker.stats() ~= nil)
 assert(net.interfaces() ~= nil)
 -- Self-checks on loaded stuff
-assert(net.list()['{{SELF_ADDR}}'])
+assert(net.list()[1].ip == '{{SELF_ADDR}}')
 assert(#modules.list() > 0)
 -- Self-check timers
 ev = event.recurrent(1 * sec, function (ev) return 1 end)

diff --git a/modules/policy/test.integr/kresd_config.j2 b/modules/policy/test.integr/kresd_config.j2
index c460b6974b76684c7317fdfbea6f3b732398b180..5ad54fea4c11df895cfc4f9e618cda3b10c86f42 100644 (file)
--- a/modules/policy/test.integr/kresd_config.j2
+++ b/modules/policy/test.integr/kresd_config.j2
@@ -44,7 +44,7 @@ assert(cache.backends() ~= nil)
 assert(worker.stats() ~= nil)
 assert(net.interfaces() ~= nil)
 -- Self-checks on loaded stuff
-assert(net.list()['{{SELF_ADDR}}'])
+assert(net.list()[1].ip == '{{SELF_ADDR}}')
 assert(#modules.list() > 0)
 -- Self-check timers
 ev = event.recurrent(1 * sec, function (ev) return 1 end)

diff --git a/modules/rebinding/test.integr/kresd_config.j2 b/modules/rebinding/test.integr/kresd_config.j2
index c04ac9b2bb50631ab15fe0457c9bb403243e1013..39bc957bde556f2fa24bdd7eb92aa3f1a9a3f7e9 100644 (file)
--- a/modules/rebinding/test.integr/kresd_config.j2
+++ b/modules/rebinding/test.integr/kresd_config.j2
@@ -44,7 +44,7 @@ assert(cache.backends() ~= nil)
 assert(worker.stats() ~= nil)
 assert(net.interfaces() ~= nil)
 -- Self-checks on loaded stuff
-assert(net.list()['{{SELF_ADDR}}'])
+assert(net.list()[1].ip == '{{SELF_ADDR}}')
 assert(#modules.list() > 0)
 -- Self-check timers
 ev = event.recurrent(1 * sec, function (ev) return 1 end)

diff --git a/modules/serve_stale/test.integr/kresd_config.j2 b/modules/serve_stale/test.integr/kresd_config.j2
index f73f471268f182137930abbe9c654b34f67f473a..b9a242c22ff73729ad333ba8f777a0657a63417d 100644 (file)
--- a/modules/serve_stale/test.integr/kresd_config.j2
+++ b/modules/serve_stale/test.integr/kresd_config.j2
@@ -44,7 +44,7 @@ assert(cache.backends() ~= nil)
 assert(worker.stats() ~= nil)
 assert(net.interfaces() ~= nil)
 -- Self-checks on loaded stuff
-assert(net.list()['{{SELF_ADDR}}'])
+assert(net.list()[1].ip == '{{SELF_ADDR}}')
 assert(#modules.list() > 0)
 -- Self-check timers
 ev = event.recurrent(1 * sec, function (ev) return 1 end)

diff --git a/modules/stats/test.integr/kresd_config.j2 b/modules/stats/test.integr/kresd_config.j2
index 44e6a4dee1a58aab36dc9b39acfb5d1685722e52..b8fd49816581a077ba673a06426a42787620231b 100644 (file)
--- a/modules/stats/test.integr/kresd_config.j2
+++ b/modules/stats/test.integr/kresd_config.j2
@@ -94,7 +94,7 @@ assert(cache.backends() ~= nil)
 assert(worker.stats() ~= nil)
 assert(net.interfaces() ~= nil)
 -- Self-checks on loaded stuff
-assert(net.list()['{{SELF_ADDR}}'])
+assert(net.list()[1].ip == '{{SELF_ADDR}}')
 assert(#modules.list() > 0)
 -- Self-check timers
 ev = event.recurrent(1 * sec, function (ev) return 1 end)

diff --git a/modules/view/addr.test.integr/kresd_config.j2 b/modules/view/addr.test.integr/kresd_config.j2
index 2837619bb397d3193f0156b1114bb6485ee7d12e..a92c1423408bfb77dac097b160bef98ae8401488 100644 (file)
--- a/modules/view/addr.test.integr/kresd_config.j2
+++ b/modules/view/addr.test.integr/kresd_config.j2
@@ -48,7 +48,7 @@ assert(cache.backends() ~= nil)
 assert(worker.stats() ~= nil)
 assert(net.interfaces() ~= nil)
 -- Self-checks on loaded stuff
-assert(net.list()['{{SELF_ADDR}}'])
+assert(net.list()[1].ip == '{{SELF_ADDR}}')
 assert(#modules.list() > 0)
 -- Self-check timers
 ev = event.recurrent(1 * sec, function (ev) return 1 end)

diff --git a/modules/view/tsig.test.integr/kresd_config.j2 b/modules/view/tsig.test.integr/kresd_config.j2
index 4b53ee36d546256e351eae7498c67cc7926d75ab..9ce0162c0b1dc10e06ad840a1d3106edeccafeb5 100644 (file)
--- a/modules/view/tsig.test.integr/kresd_config.j2
+++ b/modules/view/tsig.test.integr/kresd_config.j2
@@ -50,7 +50,7 @@ assert(cache.backends() ~= nil)
 assert(worker.stats() ~= nil)
 assert(net.interfaces() ~= nil)
 -- Self-checks on loaded stuff
-assert(net.list()['{{SELF_ADDR}}'])
+assert(net.list()[1].ip == '{{SELF_ADDR}}')
 assert(#modules.list() > 0)
 -- Self-check timers
 ev = event.recurrent(1 * sec, function (ev) return 1 end)

diff --git a/tests/integration/deckard b/tests/integration/deckard
index 9e31e7b6de81c989d4a83ab90665f32fa12f4fc1..04dd33b568b173ad7e6c01604f61999b091191d1 160000 (submodule)
--- a/tests/integration/deckard
+++ b/tests/integration/deckard
@@ -1 +1 @@
-Subproject commit 9e31e7b6de81c989d4a83ab90665f32fa12f4fc1
+Subproject commit 04dd33b568b173ad7e6c01604f61999b091191d1

diff --git a/tests/integration/kresd_config.j2 b/tests/integration/kresd_config.j2
index abfe0760fec23ee092986df4c7606e7d58f059a3..d7f4cfb663887b674127b0c41b282257447d5359 100644 (file)
--- a/tests/integration/kresd_config.j2
+++ b/tests/integration/kresd_config.j2
@@ -48,7 +48,7 @@ assert(cache.backends() ~= nil)
 assert(worker.stats() ~= nil)
 assert(net.interfaces() ~= nil)
 -- Self-checks on loaded stuff
-assert(net.list()['{{SELF_ADDR}}'])
+assert(net.list()[1].ip == '{{SELF_ADDR}}')
 assert(#modules.list() > 0)
 -- Self-check timers
 ev = event.recurrent(1 * sec, function (ev) return 1 end)