>Вторник, 17 июля 2018, 16:23 +03:00 от Vladimir Davydov : > >On Tue, Jul 17, 2018 at 04:13:49PM +0300, Vladimir Davydov wrote: >> > test/box-tap/cfg.test.lua | 8 +++++++- >> > 1 file changed, 7 insertions(+), 1 deletion(-) >> >> Please squash the test into the patch with the fix (`git rebase -i`) Ok > > >Hmm, the test doesn't pass on certain distros (see travis). I guess, >this is because they don't have syslog configured. What about wrapping >box.cfg in pcall and checking the status? Since we just want to check >that there's no crash, this should do. I'll do that way. >Or alternatively you can test >this by setting a custom syslog destination (you have to test it anyway >in your other patches AFAIR). Do you mean in syslog destination series? I had a thought about it, but did not do in v2. Will keep in mind >In this case, this particular fix doesn't >need a test case at all - it's suffices to mention that the fix is going >to be tested in the following patches. > >> >> > >> > diff --git a/test/box-tap/cfg.test.lua b/test/box-tap/cfg.test.lua >> > index ffafdbe42..605623013 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(95) >> > +test:plan(96) >> > >> > -------------------------------------------------------------------------------- >> > -- Invalid values >> > @@ -464,5 +464,11 @@ code = string.format(code_fmt, dir, instance_uuid, uuid.new()) >> > test:is(run_script(code), PANIC, "replicaset_uuid mismatch") >> > fio.rmdir(dir) >> > >> > +-- >> > +-- Check syslog configuration >> > +-- >> > +code = [[box.cfg{log = 'syslog:identity=tarantool'}]] >> > +test:is(run_script(code), 0, "valid log configuration is broken") >> > + >> > test:check() >> > os.exit(0) -- Olga Arkhangelskaia