From: Vladimir Davydov <vdavydov.dev@gmail.com> To: Olga Arkhangelskaia <arkholga@tarantool.org> Cc: tarantool-patches@freelists.org Subject: Re: [tarantool-patches] [PATCH 2/3] Syslog remote destination test Date: Fri, 13 Jul 2018 16:27:06 +0300 [thread overview] Message-ID: <20180713132706.geifcml54stw73e7@esperanza> (raw) In-Reply-To: <20180713102938.31897-3-arkholga@tarantool.org> On Fri, Jul 13, 2018 at 01:29:37PM +0300, Olga Arkhangelskaia wrote: > Adds syslog remote destination test in app-tap. > Test creates server, sets appropriate log level and redirects logs to it. > If log level received by the server is the same - test passes. > > Usage: test-run.py syslog > > Signed-off-by: Olga Arkhangelskaia <arkholga@tarantool.org> > --- > test/app-tap/syslog_remote.test.lua | 33 +++++++++++++++++++++++++++++++++ > 1 file changed, 33 insertions(+) > create mode 100755 test/app-tap/syslog_remote.test.lua IMHO better add this test case, as well as the next one, to box-tap/cfg.test.lua. > > diff --git a/test/app-tap/syslog_remote.test.lua b/test/app-tap/syslog_remote.test.lua > new file mode 100755 > index 000000000..c7bb773fa > --- /dev/null > +++ b/test/app-tap/syslog_remote.test.lua > @@ -0,0 +1,33 @@ > +#!/usr/bin/env tarantool > + > +local tap = require('tap') > +local socket = require('socket') > +local os = require('os') > +local test = tap.test("syslog_remote") > + > +test:plan(1) > +local addr = '127.0.0.1' > +local port = 8888 The port may be busy. Better use a random one. For example, see https://github.com/tarantool/tarantool/blob/fbf8be12dbb041026fc7c81018ac5f02a9fc9d18/test/app/socket.test.lua#L357 > + > +local function start_server() > + test:diag("Starting server") > + local server = socket.tcp_server(addr, port, function() end) Why do you need a tcp server? AFAIU all you need is a udp socket bound to the specified port. > + > + local sc = socket('AF_INET', 'SOCK_DGRAM', 'udp') > + sc:bind('127.0.0.1', 8888) Should be (addr, port) > + return server, sc > +end > + > +local function find_log_level() > + local opt = 'syslog:server='..addr..':'..port..',identity=tarantool' There's string.format(), which usually results in cleaner code than string concatenation. > + box.cfg{log = opt, log_level = 7} > + local buf = sc:read(300) > + test:ok(buf:match('log level 7')) Better write a specific string to the log (see log.info) and match it. Matching 'log level 7' took me a while to understand. > +end > + > +server,sc = start_server() > + > +test:test('syslog_remote',find_log_level(test)) > +sc:close() > +server:shutdown() > +os.exit(test:check() == true)
next prev parent reply other threads:[~2018-07-13 13:27 UTC|newest] Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-07-13 10:29 [tarantool-patches] [PATCH 0/3] Syslog destination Olga Arkhangelskaia 2018-07-13 10:29 ` [tarantool-patches] [PATCH 1/3] Configurable syslog destination Olga Arkhangelskaia 2018-07-13 13:12 ` Vladimir Davydov 2018-07-13 10:29 ` [tarantool-patches] [PATCH 2/3] Syslog remote destination test Olga Arkhangelskaia 2018-07-13 13:27 ` Vladimir Davydov [this message] 2018-07-13 10:29 ` [tarantool-patches] [PATCH 3/3] Syslog destination test unix socket Olga Arkhangelskaia 2018-07-13 13:34 ` Vladimir Davydov 2018-07-13 12:42 ` [tarantool-patches] [PATCH 0/3] Syslog destination 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=20180713132706.geifcml54stw73e7@esperanza \ --to=vdavydov.dev@gmail.com \ --cc=arkholga@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='Re: [tarantool-patches] [PATCH 2/3] Syslog remote destination test' \ /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