From: Vladimir Davydov <vdavydov.dev@gmail.com> To: Olga Arkhangelskaia <arkholga@tarantool.org> Cc: tarantool-patches@freelists.org Subject: Re: [tarantool-patches] [PATCH v3 4/4] box-tap:syslog remote destination test Date: Wed, 25 Jul 2018 19:43:57 +0300 [thread overview] Message-ID: <20180725164357.sg53a457d5xkd7vv@esperanza> (raw) In-Reply-To: <20180724171152.24921-5-arkholga@tarantool.org> Please fold this patch in patch 1. On Tue, Jul 24, 2018 at 08:11:52PM +0300, Olga Arkhangelskaia wrote: > @@ -507,5 +507,45 @@ os.exit(res) > ]] > test:is(run_script(code), 0, "unix socket syslog log configuration") > > +-- > +-- Check syslog remote configuration > +-- > +code = [[ > +local tap = require('tap') > +local socket = require('socket') > +local os = require('os') > +local test = tap.test("syslog_remote") > +local log = require('log') > +local errno = require('errno') > + > +addr = '127.0.0.1' > +port = 1000 + math.random(32768) > + > +sc = socket('AF_INET', 'SOCK_DGRAM', 'udp') > +local attempt = 0 > +while attempt < 10 do > +if not sc:bind (addr, port) then > + port = 1000 + math.random(32768) > + attempt = attempt + 1 > + else > + break Tab instead of spaces. Please fix. > + end > +end > +sc:bind(addr, port) > + > +local opt = string.format("syslog:server=%s:%u,identity=tarantool", addr, port) > +local res = 1 > +if pcall(box.cfg,{log = opt, log_level = 5}) then pcall is not needed. > + log.info('Test syslog destination') > + while (sc:readable(1)) do > + buf = sc:recv(1000) > + if buf:match('Test syslog destination') then res = 0 end > + end Hmm, here you use a different way of detecting the test string in the log rather than in patch 3. Please be consistent if possible and use the same method in both tests. > +end > +sc:close() > +os.exit(res) > +]] > +test:is(run_script(code), 0, "remote syslog log configuration") > + > test:check() > os.exit(0)
prev parent reply other threads:[~2018-07-25 16:43 UTC|newest] Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-07-24 17:11 [tarantool-patches] [PATCH v3 0/4] Syslog destination Olga Arkhangelskaia 2018-07-24 17:11 ` [tarantool-patches] [PATCH v3 1/4] Configurable syslog destination Olga Arkhangelskaia 2018-07-25 16:27 ` Vladimir Davydov 2018-07-24 17:11 ` [tarantool-patches] [PATCH v3 2/4] box-tap: test valid log configuration Olga Arkhangelskaia 2018-07-24 17:11 ` [tarantool-patches] [PATCH v3 3/4] box-tap: syslog destination test unix socket Olga Arkhangelskaia 2018-07-25 16:40 ` Vladimir Davydov 2018-07-24 17:11 ` [tarantool-patches] [PATCH v3 4/4] box-tap:syslog remote destination test Olga Arkhangelskaia 2018-07-25 16:43 ` Vladimir Davydov [this message]
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=20180725164357.sg53a457d5xkd7vv@esperanza \ --to=vdavydov.dev@gmail.com \ --cc=arkholga@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='Re: [tarantool-patches] [PATCH v3 4/4] box-tap: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