[Tarantool-patches] [PATCH 3/3] test: app-tap/logger -- test json in boottime logger
Cyrill Gorcunov
gorcunov at gmail.com
Tue Jun 30 19:02:09 MSK 2020
Make sure we're allowed to setup json formatter before
box.cfg() call, ie that named boot-time logger.
Part-of #5121
Signed-off-by: Cyrill Gorcunov <gorcunov at gmail.com>
---
test/app-tap/logger.test.lua | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/test/app-tap/logger.test.lua b/test/app-tap/logger.test.lua
index ae4a3b99a..a448ba87a 100755
--- a/test/app-tap/logger.test.lua
+++ b/test/app-tap/logger.test.lua
@@ -1,13 +1,24 @@
#!/usr/bin/env tarantool
local test = require('tap').test('log')
-test:plan(62)
+test:plan(64)
--- gh-3946: Assertion failure when using log_format() before box.cfg()
+--
+-- gh-5121: Allow to use 'json' output before box.cfg()
+--
local log = require('log')
-log.log_format('plain')
_, err = pcall(log.log_format, 'json')
-test:ok(err:find("json can\'t be used") ~= nil)
+test:ok(err == nil)
+
+-- We're not allowed to use json with syslog though.
+_, err = pcall(log.cfg, {log='syslog:', format='json'})
+test:ok(tostring(err):find("can\'t be used with syslog logger") ~= nil)
+
+_, err = pcall(box.cfg, {log='syslog:', log_format='json'})
+test:ok(tostring(err):find("can\'t be used with syslog logger") ~= nil)
+
+-- switch back to plain to next tests
+log.log_format('plain')
--
-- gh-689: various settings change from box.cfg/log.cfg interfaces
--
2.26.2
More information about the Tarantool-patches
mailing list