From: Vladimir Davydov <vdavydov.dev@gmail.com> To: Olga Arkhangelskaia <arkholga@tarantool.org> Cc: tarantool-patches@freelists.org Subject: Re: [tarantool-patches] [PATCH v4 3/4] box-tap: syslog destination test unix socket Date: Tue, 31 Jul 2018 16:55:35 +0300 [thread overview] Message-ID: <20180731135535.if77jnyw36xx5hob@esperanza> (raw) In-Reply-To: <20180731101833.55671-4-arkholga@tarantool.org> We don't submit tests accompanying a feature in separate patches unless there's a reason to do that. Please fold patches 3 and 4 in patch 1. On Tue, Jul 31, 2018 at 01:18:32PM +0300, Olga Arkhangelskaia wrote: > Adds syslog destination unix test in box-tap. > Test redirects logs to newly created unix socket and sets appropriate > log level. If log receives the same level - test passes. In case if > syslog is not configured we use pcall. > > Closes #3487 > --- > test/box-tap/cfg.test.lua | 29 ++++++++++++++++++++++++++++- > 1 file changed, 28 insertions(+), 1 deletion(-) > > diff --git a/test/box-tap/cfg.test.lua b/test/box-tap/cfg.test.lua > index 67e4c3af9..2b1769395 100755 > --- a/test/box-tap/cfg.test.lua > +++ b/test/box-tap/cfg.test.lua > @@ -6,7 +6,7 @@ local socket = require('socket') > local fio = require('fio') > local uuid = require('uuid') > local msgpack = require('msgpack') > -test:plan(96) > +test:plan(97) > > -------------------------------------------------------------------------------- > -- Invalid values > @@ -472,5 +472,32 @@ code = [[pcall(box.cfg, {log = 'syslog:identity=tarantool'}) > ]] > test:is(run_script(code), 0, "syslog log configuration") > > +-- > +-- Check syslog socket configuration > +-- s/socket/unix socket Also, we usually mention GitHub ticket in the comment to a test case, e.g. gh-3487. > +code = [[ > +local socket = require('socket') > +local log = require('log') > +local fio = require('fio') > + > +path = fio.pathjoin(fio.cwd(), 'log_unix_socket_test.sock') > +unix_socket = socket('AF_UNIX', 'SOCK_DGRAM', 0) > +unix_socket:bind('unix/', path) > + > +opt = string.format("syslog:server=unix:%s,identity=tarantool", path) > +res = 1 > +box.cfg{log = opt, log_level = 5} > +log.info("Test socket syslog destination") > +buf = unix_socket:read("Test socket syslog destination", 30) > +if buf ~= nil then > + if buf:match('Test socket syslog destination') then res = 0 end > +end I don't like that you use such a long string as a delimiter (first argument of 'read' is delimiter, right?). It looks weird. Why not rewrite the code exactly in the way you use for testing udp syslog destination? > + > +unix_socket:close() > +os.remove(path) > +os.exit(res) > +]] > +test:is(run_script(code), 0, "unix socket syslog log configuration") > + > test:check() > os.exit(0)
next prev parent reply other threads:[~2018-07-31 13:55 UTC|newest] Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-07-31 10:18 [tarantool-patches] [PATCH v4 0/4] Syslog destination Olga Arkhangelskaia 2018-07-31 10:18 ` [tarantool-patches] [PATCH v4 1/4] Configurable syslog destination Olga Arkhangelskaia 2018-07-31 12:45 ` Vladimir Davydov 2018-07-31 10:18 ` [tarantool-patches] [PATCH v4 2/4] box-tap: test valid log configuration Olga Arkhangelskaia 2018-07-31 10:18 ` [tarantool-patches] [PATCH v4 3/4] box-tap: syslog destination test unix socket Olga Arkhangelskaia 2018-07-31 13:55 ` Vladimir Davydov [this message] 2018-07-31 10:18 ` [tarantool-patches] [PATCH v4 4/4] box-tap:syslog remote destination test Olga Arkhangelskaia 2018-07-31 13:57 ` Vladimir Davydov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180731135535.if77jnyw36xx5hob@esperanza \ --to=vdavydov.dev@gmail.com \ --cc=arkholga@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='Re: [tarantool-patches] [PATCH v4 3/4] box-tap: syslog destination test unix socket' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox