Skip to content
Snippets Groups Projects
Commit 137cac20 authored by Dmitry Ivanov's avatar Dmitry Ivanov
Browse files

fix(tests): Fix gh_7860_syslog_json_test broken due to memtx_sort_threads

test-run.py sets OMP_NUM_THREADS which causes this test to misbehave:
it doesn't expect to see a warning regarding the use of this env var
as the first log line.

Alternatively, we could update test-run's submodule, but in practice
this breaks other tests e.g. replication-luatest/linearizable_test.lua.

NO_DOC=internal
NO_TEST=internal
NO_CHANGELOG=internal
parent a4a00d16
No related branches found
No related tags found
No related merge requests found
......@@ -32,6 +32,11 @@ g.before_all(function(cg)
cg.check_json = function(expected_msg)
local s = cg.sock:recv(1024)
t.assert(s)
-- HACK: test-run.py sets OMP_NUM_THREADS which changes the 1st msg.
if s:find("Use cfg option 'memtx_sort_threads' instead.") then
s = cg.sock:recv(1024)
t.assert(s)
end
local hdr, body = unpack(s:split(': ', 1))
t.assert_str_matches(
hdr, '<%d+>%a+%s+%d%d?%s+%d%d:%d%d:%d%d%s+tt%[' .. cg.pid .. '%]')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment