From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Wed, 25 Jul 2018 19:43:57 +0300 From: Vladimir Davydov Subject: Re: [tarantool-patches] [PATCH v3 4/4] box-tap:syslog remote destination test Message-ID: <20180725164357.sg53a457d5xkd7vv@esperanza> References: <20180724171152.24921-1-arkholga@tarantool.org> <20180724171152.24921-5-arkholga@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180724171152.24921-5-arkholga@tarantool.org> To: Olga Arkhangelskaia Cc: tarantool-patches@freelists.org List-ID: 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)