diff --git a/test/replication/long_row_timeout.result b/test/replication/long_row_timeout.result index 9284d9c2ae258c18b92ae5da39550b0e92af49f7..e5ae2084edf657bd6a27844ad032fb6051d7b2fb 100644 --- a/test/replication/long_row_timeout.result +++ b/test/replication/long_row_timeout.result @@ -21,9 +21,9 @@ test_run:cmd('start server replica') --- - true ... -box.info.replication[2].downstream.status +test_run:wait_downstream(2, {status = 'follow'}) --- -- follow +- true ... -- make applier incapable of reading rows in one go, so that it -- yields a couple of times. @@ -54,15 +54,16 @@ test_run:cmd('setopt delimiter ";"') --- - true ... -ok = true; +status = nil; --- ... start = fiber.time(); --- ... while fiber.time() - start < 3 * box.cfg.replication_timeout do - if box.info.replication[2].downstream.status ~= 'follow' then - ok = false + status = box.info.replication[2].downstream.status + if status ~= 'follow' then + status = box.info.replication break end fiber.sleep(0.001) @@ -73,9 +74,9 @@ test_run:cmd('setopt delimiter ""'); --- - true ... -ok +status --- -- true +- follow ... s:drop() --- diff --git a/test/replication/long_row_timeout.test.lua b/test/replication/long_row_timeout.test.lua index 7fc52e3e2230c94d647be2197ed6494fa571dd20..28efe432643d6180a074fd53f5b8afb3e01b9028 100644 --- a/test/replication/long_row_timeout.test.lua +++ b/test/replication/long_row_timeout.test.lua @@ -8,8 +8,7 @@ test_run = require('test_run').new() box.schema.user.grant('guest', 'replication') test_run:cmd('create server replica with rpl_master=default, script="replication/replica.lua"') test_run:cmd('start server replica') -box.info.replication[2].downstream.status - +test_run:wait_downstream(2, {status = 'follow'}) -- make applier incapable of reading rows in one go, so that it -- yields a couple of times. @@ -22,18 +21,19 @@ for i = 1,5 do box.space.test:replace{1, digest.urandom(1024)} collectgarbage('c -- replication_disconnect_timeout is 4 * replication_timeout, check that -- replica doesn't time out too early. test_run:cmd('setopt delimiter ";"') -ok = true; +status = nil; start = fiber.time(); while fiber.time() - start < 3 * box.cfg.replication_timeout do - if box.info.replication[2].downstream.status ~= 'follow' then - ok = false + status = box.info.replication[2].downstream.status + if status ~= 'follow' then + status = box.info.replication break end fiber.sleep(0.001) end; test_run:cmd('setopt delimiter ""'); -ok +status s:drop() test_run:cmd('stop server replica') diff --git a/test/replication/suite.ini b/test/replication/suite.ini index 347710f580e6dcd8cad4442cec66f5aa606ba2aa..a7b73754860449dd2996f5efc64c2da00d77aa4d 100644 --- a/test/replication/suite.ini +++ b/test/replication/suite.ini @@ -17,10 +17,6 @@ fragile = { "issues": [ "gh-3870" ], "checksums": [ "5d3f58323aafc1a11d9b9264258f7acf", "919921e13968b108d342555746ba55c9" ] }, - "long_row_timeout.test.lua": { - "issues": [ "gh-4351" ], - "checksums": [ "acd88b48b0046ec52346274eeeef0b25", "a645ff7616b5caf0fcd2099022b776bf", "eb3e92564ba71e7b7c458050223f4d57" ] - }, "skip_conflict_row.test.lua": { "issues": [ "gh-4958" ], "checksums": [ "a21f07339237cd9d0b8c74e144284449", "0359b0b1cc80052faf96972959513694", "ef104dfd04afa7c75087de13246e3eb0" ]