From 6d4d30a00478322ac84bdbf576fb479c40aeb9e4 Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Thu, 8 Jul 2021 13:32:37 +0200 Subject: [PATCH] logging: add test for log groups Besides testing the API, running this test also ensures all log groups have been properly defined (as long as kr_assertions are turned on). --- daemon/lua/log.test.lua | 15 +++++++++++++++ daemon/lua/meson.build | 1 + lib/log.c | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 daemon/lua/log.test.lua diff --git a/daemon/lua/log.test.lua b/daemon/lua/log.test.lua new file mode 100644 index 000000000..0b73c564c --- /dev/null +++ b/daemon/lua/log.test.lua @@ -0,0 +1,15 @@ +local function test_log_group() + same(get_log_group()['system'], nil, '"system" log group not logged by default') + add_log_group('system') + same(get_log_group()['system'], true, 'adding "system" log group') + add_log_group('devel') + same(get_log_group()['devel'], true, 'adding another ("devel") log group') + del_log_group('system') + same(get_log_group()['system'], nil, 'removing "system" log group') + boom(add_log_group, { 'nonexistent' }, "nonexistent group cant't be added") + boom(del_log_group, { 'nonexistent2' }, "nonexistent2 group can't be removed") +end + +return { + test_log_group, +} diff --git a/daemon/lua/meson.build b/daemon/lua/meson.build index ee761d56e..ee71927b5 100644 --- a/daemon/lua/meson.build +++ b/daemon/lua/meson.build @@ -4,6 +4,7 @@ config_tests += [ ['controlsock', files('controlsock.test.lua')], ['krprint', files('krprint.test.lua')], + ['log', files('log.test.lua')], ['ta', files('trust_anchors.test/ta.test.lua')], ['ta_bootstrap', files('trust_anchors.test/bootstrap.test.lua'), ['y2k38']], ] diff --git a/lib/log.c b/lib/log.c index 81792645f..5cb996b0c 100644 --- a/lib/log.c +++ b/lib/log.c @@ -39,7 +39,7 @@ log_group_names_t log_group_names[] = { GRP_NAME_ITEM(LOG_GRP_DOH), GRP_NAME_ITEM(LOG_GRP_DNSSEC), GRP_NAME_ITEM(LOG_GRP_HINT), - GRP_NAME_ITEM(LOG_GRP_PLAN), // TODO check all log levels are defined - how? + GRP_NAME_ITEM(LOG_GRP_PLAN), GRP_NAME_ITEM(LOG_GRP_ITERATOR), GRP_NAME_ITEM(LOG_GRP_VALIDATOR), GRP_NAME_ITEM(LOG_GRP_RESOLVER), -- 2.47.2