Skip to content
Snippets Groups Projects
Commit 88c4c19a authored by Vladimir Davydov's avatar Vladimir Davydov
Browse files

test: vinyl/layout: fix bloom filter filtering in output

We filter bloom filters, because they depend on ICU version and hence
the test output may vary from one platform to another (see commit
0a37ccad "Filter out bloom_filter in vinyl/layout.test.lua").
However, using test_run for this is unreliable, because a bloom string
can contain newline characters and hence be split in multiple lines in
console output, in which case the filter won't work. Fix this by
filtering bloom_filter manually.
parent 7ee84c95
No related branches found
No related tags found
No related merge requests found
......@@ -95,6 +95,9 @@ for i, path in pairs(files) do
local rows = {}
local i = 1
for lsn, row in xlog.pairs(path) do
if row.BODY.bloom_filter ~= nil then
row.BODY.bloom_filter = '<bloom_filter>'
end
rows[i] = row
i = i + 1
end
......@@ -118,10 +121,6 @@ test_run:cmd("push filter 'offset: .*' to 'offset: <offset>'")
---
- true
...
test_run:cmd("push filter 'bloom_filter: .*' to 'bloom_filter: <bloom_filter>'")
---
- true
...
result
---
- - - 00000000000000000009.vylog
......
......@@ -42,6 +42,9 @@ for i, path in pairs(files) do
local rows = {}
local i = 1
for lsn, row in xlog.pairs(path) do
if row.BODY.bloom_filter ~= nil then
row.BODY.bloom_filter = '<bloom_filter>'
end
rows[i] = row
i = i + 1
end
......@@ -55,6 +58,5 @@ box.backup.stop() -- resume the garbage collection process
test_run:cmd("push filter 'timestamp: .*' to 'timestamp: <timestamp>'")
test_run:cmd("push filter 'offset: .*' to 'offset: <offset>'")
test_run:cmd("push filter 'bloom_filter: .*' to 'bloom_filter: <bloom_filter>'")
result
test_run:cmd("clear filter")
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