From b429345228bb912db905e8c47e69578d15beb765 Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Wed, 6 Mar 2019 15:07:52 +0100 Subject: [PATCH] meson: run missing config tests --- daemon/lua/meson.build | 1 + daemon/lua/trust_anchors.test/bootstrap.test.lua | 2 +- modules/http/http.test.lua | 4 ++-- modules/http/test_tls/tls.test.lua | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/daemon/lua/meson.build b/daemon/lua/meson.build index 6c2586090..d11bf7731 100644 --- a/daemon/lua/meson.build +++ b/daemon/lua/meson.build @@ -1,6 +1,7 @@ # daemon: lua modules config_tests += [ + ['ta', files('trust_anchors.test/ta.test.lua')], ['ta_bootstrap', files('trust_anchors.test/bootstrap.test.lua')], ] diff --git a/daemon/lua/trust_anchors.test/bootstrap.test.lua b/daemon/lua/trust_anchors.test/bootstrap.test.lua index 12b6cc304..ea35c487e 100644 --- a/daemon/lua/trust_anchors.test/bootstrap.test.lua +++ b/daemon/lua/trust_anchors.test/bootstrap.test.lua @@ -1,5 +1,5 @@ -- check prerequisites -local has_http = pcall(require, 'http') and pcall(require, 'http.request') +local has_http = pcall(require, 'kres_modules.http') and pcall(require, 'http.request') if not has_http then pass('skipping bootstrap tests because http module is not not installed') done() diff --git a/modules/http/http.test.lua b/modules/http/http.test.lua index 3d0ac1485..8d987597e 100644 --- a/modules/http/http.test.lua +++ b/modules/http/http.test.lua @@ -1,11 +1,11 @@ -- check prerequisites -local has_http = pcall(require, 'http') and pcall(require, 'http.request') +local has_http = pcall(require, 'kres_modules.http') and pcall(require, 'http.request') if not has_http then pass('skipping http module test because its not installed') done() else local request = require('http.request') - local endpoints = require('http').endpoints + local endpoints = require('kres_modules.http').endpoints -- custom endpoints endpoints['/test'] = {'text/custom', function () return 'hello' end} diff --git a/modules/http/test_tls/tls.test.lua b/modules/http/test_tls/tls.test.lua index 9eac38298..5bc3bc671 100644 --- a/modules/http/test_tls/tls.test.lua +++ b/modules/http/test_tls/tls.test.lua @@ -1,5 +1,5 @@ -- check prerequisites -local has_http = pcall(require, 'http') and pcall(require, 'http.request') +local has_http = pcall(require, 'kres_modules.http') and pcall(require, 'http.request') if not has_http then pass('skipping http module test because its not installed') done() -- 2.47.3