diff --git a/test/box/net.box_tx_timeout.result b/test/box/net.box_tx_timeout.result index 3493e062db5654f2329fda84d5df5f9621959a76..1bf5129c77d06cd489402792a5767bf087a6a6fa 100644 --- a/test/box/net.box_tx_timeout.result +++ b/test/box/net.box_tx_timeout.result @@ -38,6 +38,12 @@ box.cfg({ txn_timeout = txn_timeout }) box.schema.user.grant("guest", "super") --- ... +fiber = require('fiber') +--- +... +function sleep_with_timeout(timeout) fiber.sleep(timeout) end +--- +... test_run:switch("default") --- - true @@ -93,7 +99,7 @@ space:select({}) -- [1] --- - - [1] ... -fiber.sleep(txn_timeout + 0.1) +_ = test_run:eval("test", string.format("sleep_with_timeout(%f)", txn_timeout + 0.1)) --- ... space:select({}) -- [] @@ -128,7 +134,7 @@ space:select({}) -- [1] --- - - [1] ... -fiber.sleep(txn_timeout + 0.1) +_= test_run:eval("test", string.format("sleep_with_timeout(%f)", txn_timeout + 0.1)) --- ... space:select({}) -- [] diff --git a/test/box/net.box_tx_timeout.test.lua b/test/box/net.box_tx_timeout.test.lua index 1247575683be8f1e9d1a46b695c2c24fe3f65db1..3280568d61de0b43a75a864f4f900f0a15b98b74 100644 --- a/test/box/net.box_tx_timeout.test.lua +++ b/test/box/net.box_tx_timeout.test.lua @@ -12,6 +12,8 @@ _ = s:create_index("pk") txn_timeout = 0.5 box.cfg({ txn_timeout = txn_timeout }) box.schema.user.grant("guest", "super") +fiber = require('fiber') +function sleep_with_timeout(timeout) fiber.sleep(timeout) end test_run:switch("default") -- Checks for remote transactions @@ -35,7 +37,7 @@ stream:begin({timeout = "5"}) stream:begin() space:replace({1}) space:select({}) -- [1] -fiber.sleep(txn_timeout + 0.1) +_ = test_run:eval("test", string.format("sleep_with_timeout(%f)", txn_timeout + 0.1)) space:select({}) -- [] space:replace({2}) fiber.yield() @@ -47,7 +49,7 @@ stream:commit() -- transaction was aborted by timeout stream:begin({timeout = txn_timeout}) space:replace({1}) space:select({}) -- [1] -fiber.sleep(txn_timeout + 0.1) +_= test_run:eval("test", string.format("sleep_with_timeout(%f)", txn_timeout + 0.1)) space:select({}) -- [] space:replace({2}) fiber.yield()