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

Fix tests failing after the last commit

Follow-up dd30970e ("replication: log replica_id in addition to lsn
on conflict").
parent dd30970e
No related branches found
No related tags found
No related merge requests found
......@@ -244,6 +244,7 @@ test_request_str()
{
plan(1);
struct xrow_header header;
header.replica_id = 5;
header.lsn = 100;
struct request request;
request.header = &header;
......@@ -263,7 +264,8 @@ test_request_str()
request.ops = pos;
pos = mp_encode_array(pos, 1);
pos = mp_encode_uint(pos, 400);
is(strcmp("{type: 'SELECT', lsn: 100, space_id: 512, index_id: 1, "\
is(strcmp("{type: 'SELECT', replica_id: 5, lsn: 100, "
"space_id: 512, index_id: 1, "
"key: [200], tuple: [300], ops: [400]}",
request_str(&request)), 0, "request_str");
......
......@@ -94,7 +94,7 @@ logpath = fio.pathjoin(fio.cwd(), 'panic.log')
grep_file_tail(logpath, 256, "LSN for 1 is used twice or COMMIT order is broken: confirmed: 1, new: 1, req: {.*}")
---
- 'LSN for 1 is used twice or COMMIT order is broken: confirmed: 1, new: 1, req: {type:
''REPLACE'', lsn: 1, space_id: 272, index_id: 0, tuple: ["t0", "v1"]}'
''REPLACE'', replica_id: 1, lsn: 1, space_id: 272, index_id: 0, tuple: ["t0", "v1"]}'
...
test_run:cmd('cleanup server panic')
---
......@@ -162,7 +162,8 @@ test_run:cmd("push filter 'confirmed: "..lsn..", new: "..lsn.."' to '<lsn>'")
grep_file_tail(logpath, 256, "(LSN for 1 is used twice or COMMIT order is broken: confirmed: "..lsn..", new: "..lsn.."), req: ({.*})")
---
- 'LSN for 1 is used twice or COMMIT order is broken: <lsn>'
- '{type: ''INSERT'', lsn: <lsn>, space_id: <space_id>, index_id: 0, tuple: [2, "v1"]}'
- '{type: ''INSERT'', replica_id: 1, lsn: <lsn>, space_id: <space_id>, index_id: 0, tuple: [2,
"v1"]}'
...
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