<HTML><BODY><div>Hi Sergey, thank you for the patch, LGTM.<br><br> <blockquote style="border-left:1px solid #0857A6; margin:10px; padding:0 0 0 10px;">Среда, 8 апреля 2020, 18:43 +03:00 от Sergey Bronnikov <estetus@gmail.com>:<br> <div id=""><div class="js-helper js-readmsg-msg"><style type="text/css"></style><div><div id="style_15863606100466449045_BODY">From: Sergey Bronnikov <<a href="/compose?To=sergeyb@tarantool.org">sergeyb@tarantool.org</a>><br><br>Closes #4681<br>---<br> test/app-tap/console.test.lua | 4 ---<br> test/app-tap/csv.test.lua | 28 ++++++++--------<br> test/box-py/box.lua | 2 +-<br> test/box-tap/gc.test.lua | 4 +--<br> test/box/box.lua | 2 +-<br> test/box/hash_multipart.result | 2 +-<br> test/box/hash_multipart.test.lua | 2 +-<br> test/box/iproto_stress.result | 8 ++---<br> test/box/iproto_stress.test.lua | 4 +--<br> test/box/lua/cfg_bad_vinyl_dir.lua | 2 +-<br> test/box/lua/cfg_rtree.lua | 2 +-<br> test/box/lua/cfg_test1.lua | 2 +-<br> test/box/lua/cfg_test2.lua | 2 +-<br> test/box/lua/cfg_test3.lua | 2 +-<br> test/box/lua/cfg_test4.lua | 2 +-<br> test/box/lua/cfg_test5.lua | 4 +--<br> test/box/lua/cfg_test6.lua | 2 +-<br> test/box/lua/utils.lua | 3 +-<br> test/box/on_schema_init.lua | 2 +-<br> test/box/proxy.lua | 2 +-<br> test/box/tiny.lua | 2 +-<br> test/box/tree_pk.result | 6 ++--<br> test/box/tree_pk.test.lua | 6 ++--<br> test/engine/tree_min_max_count.result | 2 +-<br> test/engine/tree_min_max_count.test.lua | 2 +-<br> test/replication-py/master.lua | 2 +-<br> test/replication-py/panic.lua | 2 +-<br> test/replication/master.lua | 2 +-<br> test/replication/replicaset_ro_mostly.result | 2 +-<br> .../replication/replicaset_ro_mostly.test.lua | 2 +-<br> test/sql-tap/analyze3.test.lua | 6 ++--<br> test/sql-tap/analyze9.test.lua | 16 ++++-----<br> .../gh-4077-iproto-execute-no-bind.test.lua | 7 ++--<br> test/sql-tap/index1.test.lua | 1 -<br> test/sql-tap/join3.test.lua | 2 +-<br> test/sql-tap/select9.test.lua | 10 ++----<br> test/sql-tap/tkt-fa7bf5ec.test.lua | 6 ++--<br> test/sql-tap/where2.test.lua | 2 +-<br> test/sql/lua/sql_tokenizer.lua | 2 +-<br> test/sql/savepoints.result | 6 ++--<br> test/sql/savepoints.test.lua | 6 ++--<br> test/sql/triggers.result | 2 +-<br> test/sql/triggers.test.lua | 2 +-<br> test/vinyl/large.lua | 4 +--<br> test/vinyl/stat.result | 33 ++++++++++++-------<br> test/vinyl/stat.test.lua | 22 ++++++-------<br> test/vinyl/txn_proxy.lua | 6 ++--<br> test/vinyl/vinyl.lua | 2 +-<br> test/wal_off/rtree_benchmark.result | 2 +-<br> test/wal_off/rtree_benchmark.test.lua | 2 +-<br> test/xlog-py/box.lua | 2 +-<br> test/xlog/big_tx.result | 2 +-<br> test/xlog/big_tx.test.lua | 2 +-<br> test/xlog/checkpoint_daemon.result | 4 +--<br> test/xlog/checkpoint_daemon.test.lua | 4 +--<br> test/xlog/panic.lua | 2 +-<br> test/xlog/panic_on_wal_error.result | 2 +-<br> test/xlog/panic_on_wal_error.test.lua | 2 +-<br> test/xlog/reader.result | 2 +-<br> test/xlog/reader.test.lua | 2 +-<br> test/xlog/snap_io_rate.test.lua | 2 +-<br> test/xlog/transaction.result | 18 +++++-----<br> test/xlog/transaction.test.lua | 18 +++++-----<br> test/xlog/xlog.lua | 2 +-<br> 64 files changed, 157 insertions(+), 155 deletions(-)<br><br>diff --git a/test/app-tap/console.test.lua b/test/app-tap/console.test.lua<br>index da5c1e71e..737450387 100755<br>--- a/test/app-tap/console.test.lua<br>+++ b/test/app-tap/console.test.lua<br>@@ -5,7 +5,6 @@ local console = require('console')<br> local socket = require('socket')<br> local yaml = require('yaml')<br> local fiber = require('fiber')<br>-local ffi = require('ffi')<br> local log = require('log')<br> local fio = require('fio')<br> <br>@@ -59,12 +58,9 @@ test:is(#client:read(EOL) > 0, true, "_G")<br> client:write("require('fiber').id()\n")<br> local fid1 = yaml.decode(client:read(EOL))[1]<br> local state = fiber.find(fid1).storage.console<br>-local server_info = state.client:peer()<br> local client_info = state.client:name()<br> test:is(client_info.host, client_info.host, "state.socker:peer().host")<br> test:is(client_info.port, client_info.port, "state.socker:peer().port")<br>-server_info = nil<br>-client_info = nil<br> <br> -- Check console.delimiter()<br> client:write("require('console').delimiter(';')\n")<br>diff --git a/test/app-tap/csv.test.lua b/test/app-tap/csv.test.lua<br>index a7f17b1ea..689db7997 100755<br>--- a/test/app-tap/csv.test.lua<br>+++ b/test/app-tap/csv.test.lua<br>@@ -2,9 +2,9 @@<br> <br> local function table2str(t)<br> local res = ""<br>- for k, line in pairs(t) do<br>+ for _, line in pairs(t) do<br> local s = ""<br>- for k2, field in pairs(line) do<br>+ for _, field in pairs(line) do<br> s = s .. '|' .. field .. '|\t'<br> end<br> res = res .. s .. '\n'<br>@@ -12,9 +12,9 @@ local function table2str(t)<br> return res<br> end<br> <br>-local function myread(self, bytes)<br>+local function myread(self, bytes)<br> self.i = self.i + bytes<br>- return self.v:sub(self.i - bytes + 1, self.i)<br>+ return self.v:sub(self.i - bytes + 1, self.i)<br> end<br> local csv = require('csv')<br> local fio = require('fio')<br>@@ -27,10 +27,10 @@ local test4_ans = '|123|\t|5|\t|92|\t|0|\t|0|\t\n|1|\t|12 34|\t|56|\t' ..<br> local test5_ans = "|1|\t\n|23|\t|456|\t|abcac|\t|'multiword field 4'|\t\n" ..<br> "|none|\t|none|\t|0|\t\n||\t||\t||\t\n|aba|\t|adda|\t|f" ..<br> "3|\t|0|\t\n|local res = internal.pwrite(self.fh|\t|dat" ..<br>- "a|\t|len|\t|offset)|\t\n|iflag = bit.bor(iflag|\t|fio." ..<br>+ "a|\t|len|\t|offset)|\t\n|iflag = bit.bor(iflag|\t|fio." ..<br> "c.flag[ flag ])|\t\n||\t||\t||\t\n"<br> local test6_ans = "|23|\t|456|\t|abcac|\t|'multiword field 4'|\t\n|none|" ..<br>- "\t|none|\t|0|\t\n||\t||\t||\t\n|aba|\t|adda|\t|f3|\t|" ..<br>+ "\t|none|\t|0|\t\n||\t||\t||\t\n|aba|\t|adda|\t|f3|\t|" ..<br> "0|\t\n|local res = internal.pwrite(self.fh|\t|data|\t" ..<br> "|len|\t|offset)|\t\n|iflag = bit.bor(iflag|\t|fio.c.f" ..<br> "lag[ flag ])|\t\n||\t||\t||\t\n"<br>@@ -62,7 +62,7 @@ local f = fio.open(file1, { 'O_WRONLY', 'O_TRUNC', 'O_CREAT' }, tonumber('0777',<br> f:write("123 , 5 , 92 , 0, 0\n" ..<br> "1, 12 34, 56, \"quote , \", 66\nok")<br> f:close()<br>-f = fio.open(file1, {'O_RDONLY'})<br>+f = fio.open(file1, {'O_RDONLY'})<br> test:is(table2str(csv.load(f, {chunk_size = 10})), test4_ans, "fio test1")<br> f:close()<br> <br>@@ -77,20 +77,20 @@ f:write("1\n23,456,abcac,\'multiword field 4\'\n" ..<br> ",,"<br> )<br> f:close()<br>-f = fio.open(file2, {'O_RDONLY'})<br>+f = fio.open(file2, {'O_RDONLY'})<br> --symbol by symbol reading<br>-test:is(table2str(csv.load(f, {chunk_size = 1})), test5_ans, "fio test2")<br>+test:is(table2str(csv.load(f, {chunk_size = 1})), test5_ans, "fio test2")<br> f:close()<br> <br>-f = fio.open(file2, {'O_RDONLY'})<br>+f = fio.open(file2, {'O_RDONLY'})<br> opts = {chunk_size = 7, skip_head_lines = 1}<br> --7 symbols per chunk<br>-test:is(table2str(csv.load(f, opts)), test6_ans, "fio test3")<br>+test:is(table2str(csv.load(f, opts)), test6_ans, "fio test3")<br> f:close()<br> <br> t = {<br>- {'quote" d', ',and, comma', 'both " of " t,h,e,m'},<br>- {'"""', ',","'},<br>+ {'quote" d', ',and, comma', 'both " of " t,h,e,m'},<br>+ {'"""', ',","'},<br> {'mul\nti\nli\r\nne\n\n', 'field'},<br> {""},<br> {'"'},<br>@@ -100,7 +100,7 @@ t = {<br> f = require("fio").open(file3, { "O_WRONLY", "O_TRUNC" , "O_CREAT"}, 0x1FF)<br> csv.dump(t, {}, f)<br> f:close()<br>-f = fio.open(file3, {'O_RDONLY'})<br>+f = fio.open(file3, {'O_RDONLY'})<br> t2 = csv.load(f, {chunk_size = 5})<br> f:close()<br> <br>diff --git a/test/box-py/box.lua b/test/box-py/box.lua<br>index e9403774c..35a087de9 100644<br>--- a/test/box-py/box.lua<br>+++ b/test/box-py/box.lua<br>@@ -1,5 +1,5 @@<br> #!/usr/bin/env tarantool<br>-os = require('os')<br>+local os = require('os')<br> <br> box.cfg{<br> listen = os.getenv("LISTEN"),<br>diff --git a/test/box-tap/gc.test.lua b/test/box-tap/gc.test.lua<br>index f88752e71..f0155779c 100755<br>--- a/test/box-tap/gc.test.lua<br>+++ b/test/box-tap/gc.test.lua<br>@@ -4,7 +4,7 @@ local fiber = require('fiber')<br> <br> box.cfg{}<br> <br>-local debug = type(box.error.injection) == "table"<br>+local debug = type(box.error.injection) == "table"<br> <br> -- check box.info.gc() is false if snapshot is not in progress<br> local test = tap.test('box.info.gc')<br>@@ -19,7 +19,7 @@ test:is(gc.checkpoint_is_in_progress, false, "checkpoint is not in progress")<br> if debug then<br> box.error.injection.set("ERRINJ_SNAP_COMMIT_DELAY", true)<br> local snapshot_f = function()<br>- box.snapshot()<br>+ box.snapshot()<br> end<br> fiber.create(snapshot_f)<br> local gc = box.info.gc()<br>diff --git a/test/box/box.lua b/test/box/box.lua<br>index 6fad07015..2cf399f96 100644<br>--- a/test/box/box.lua<br>+++ b/test/box/box.lua<br>@@ -1,5 +1,5 @@<br> #!/usr/bin/env tarantool<br>-os = require('os')<br>+local os = require('os')<br> <br> local msgpack = require('msgpack')<br> <br>diff --git a/test/box/hash_multipart.result b/test/box/hash_multipart.result<br>index e94313b62..e6915652f 100644<br>--- a/test/box/hash_multipart.result<br>+++ b/test/box/hash_multipart.result<br>@@ -62,7 +62,7 @@ test_run:cmd("setopt delimiter ';'")<br> function select_all()<br> local result = {}<br> local tuple, v<br>- for tuple, v in hash:pairs() do<br>+ for _, v in hash:pairs() do<br> table.insert(result, v)<br> end<br> return result<br>diff --git a/test/box/hash_multipart.test.lua b/test/box/hash_multipart.test.lua<br>index c0a871bee..c572d13b6 100644<br>--- a/test/box/hash_multipart.test.lua<br>+++ b/test/box/hash_multipart.test.lua<br>@@ -24,7 +24,7 @@ test_run:cmd("setopt delimiter ';'")<br> function select_all()<br> local result = {}<br> local tuple, v<br>- for tuple, v in hash:pairs() do<br>+ for _, v in hash:pairs() do<br> table.insert(result, v)<br> end<br> return result<br>diff --git a/test/box/iproto_stress.result b/test/box/iproto_stress.result<br>index 7149d6c52..3b5b0a031 100644<br>--- a/test/box/iproto_stress.result<br>+++ b/test/box/iproto_stress.result<br>@@ -76,13 +76,13 @@ test_run:wait_cond(function() return n_workers == 0 end, 60)<br> ---<br> - true<br> ...<br>-n_workers -- 0<br>+assert(n_workers == 0)<br> ---<br>-- 0<br>+- true<br> ...<br>-n_errors -- 0<br>+assert(n_errors == 0)<br> ---<br>-- 0<br>+- true<br> ...<br> box.schema.user.revoke('guest', 'read,write,execute', 'universe')<br> ---<br>diff --git a/test/box/iproto_stress.test.lua b/test/box/iproto_stress.test.lua<br>index 1e1a6578b..68d1f56fd 100644<br>--- a/test/box/iproto_stress.test.lua<br>+++ b/test/box/iproto_stress.test.lua<br>@@ -42,8 +42,8 @@ fiber.sleep(0.1)<br> box.error.injection.set("ERRINJ_WAL_DELAY", false)<br> <br> test_run:wait_cond(function() return n_workers == 0 end, 60)<br>-n_workers -- 0<br>-n_errors -- 0<br>+assert(n_workers == 0)<br>+assert(n_errors == 0)<br> <br> box.schema.user.revoke('guest', 'read,write,execute', 'universe')<br> s:drop()<br>diff --git a/test/box/lua/cfg_bad_vinyl_dir.lua b/test/box/lua/cfg_bad_vinyl_dir.lua<br>index 8e1a98dc8..82746b99a 100644<br>--- a/test/box/lua/cfg_bad_vinyl_dir.lua<br>+++ b/test/box/lua/cfg_bad_vinyl_dir.lua<br>@@ -1,5 +1,5 @@<br> #!/usr/bin/env tarantool<br>-os = require('os')<br>+local os = require('os')<br> <br> box.cfg{<br> listen = os.getenv("LISTEN"),<br>diff --git a/test/box/lua/cfg_rtree.lua b/test/box/lua/cfg_rtree.lua<br>index f2d32ef7d..860cb14a8 100644<br>--- a/test/box/lua/cfg_rtree.lua<br>+++ b/test/box/lua/cfg_rtree.lua<br>@@ -1,5 +1,5 @@<br> #!/usr/bin/env tarantool<br>-os = require('os')<br>+local os = require('os')<br> box.error.injection.set("ERRINJ_INDEX_RESERVE", true)<br> box.cfg{<br> listen = os.getenv("LISTEN"),<br>diff --git a/test/box/lua/cfg_test1.lua b/test/box/lua/cfg_test1.lua<br>index 60b7aff9a..aa026ed42 100644<br>--- a/test/box/lua/cfg_test1.lua<br>+++ b/test/box/lua/cfg_test1.lua<br>@@ -1,5 +1,5 @@<br> #!/usr/bin/env tarantool<br>-os = require('os')<br>+local os = require('os')<br> <br> box.cfg{<br> listen = os.getenv("LISTEN"),<br>diff --git a/test/box/lua/cfg_test2.lua b/test/box/lua/cfg_test2.lua<br>index 2397f9c19..536661698 100644<br>--- a/test/box/lua/cfg_test2.lua<br>+++ b/test/box/lua/cfg_test2.lua<br>@@ -1,5 +1,5 @@<br> #!/usr/bin/env tarantool<br>-os = require('os')<br>+local os = require('os')<br> <br> box.cfg{<br> listen = os.getenv("LISTEN"),<br>diff --git a/test/box/lua/cfg_test3.lua b/test/box/lua/cfg_test3.lua<br>index 6a6e544b6..4978900fb 100644<br>--- a/test/box/lua/cfg_test3.lua<br>+++ b/test/box/lua/cfg_test3.lua<br>@@ -1,5 +1,5 @@<br> #!/usr/bin/env tarantool<br>-os = require('os')<br>+local os = require('os')<br> <br> box.cfg{<br> listen = os.getenv("LISTEN"),<br>diff --git a/test/box/lua/cfg_test4.lua b/test/box/lua/cfg_test4.lua<br>index 82dab8757..21a38f95c 100644<br>--- a/test/box/lua/cfg_test4.lua<br>+++ b/test/box/lua/cfg_test4.lua<br>@@ -1,5 +1,5 @@<br> #!/usr/bin/env tarantool<br>-os = require('os')<br>+local os = require('os')<br> <br> box.cfg{<br> listen = os.getenv("LISTEN"),<br>diff --git a/test/box/lua/cfg_test5.lua b/test/box/lua/cfg_test5.lua<br>index e3eb87392..8b6f9b31c 100644<br>--- a/test/box/lua/cfg_test5.lua<br>+++ b/test/box/lua/cfg_test5.lua<br>@@ -1,5 +1,5 @@<br> #!/usr/bin/env tarantool<br>-os = require('os')<br>+local os = require('os')<br> <br> box.cfg{<br> listen = os.getenv("LISTEN"),<br>@@ -7,4 +7,4 @@ box.cfg{<br> }<br> <br> require('console').listen(os.getenv('ADMIN'))<br>-box.schema.user.grant('guest', 'read,write,execute', 'universe')<br>\ No newline at end of file<br>+box.schema.user.grant('guest', 'read,write,execute', 'universe')<br>diff --git a/test/box/lua/cfg_test6.lua b/test/box/lua/cfg_test6.lua<br>index efcfc6f3e..0a5859bc5 100644<br>--- a/test/box/lua/cfg_test6.lua<br>+++ b/test/box/lua/cfg_test6.lua<br>@@ -1,5 +1,5 @@<br> #!/usr/bin/env tarantool<br>-os = require('os')<br>+local os = require('os')<br> <br> box.cfg{<br> listen = os.getenv("LISTEN"),<br>diff --git a/test/box/lua/utils.lua b/test/box/lua/utils.lua<br>index 5f859fd19..058c4a471 100644<br>--- a/test/box/lua/utils.lua<br>+++ b/test/box/lua/utils.lua<br>@@ -212,10 +212,9 @@ function create_iterator(obj, key, opts)<br> return tp<br> end<br> res.iterate_over = function()<br>- local tp = nil<br> local ret = {}<br> local i = 0<br>- tp = res.next()<br>+ local tp = res.next()<br> while tp do<br> ret[i] = tp<br> i = i + 1<br>diff --git a/test/box/on_schema_init.lua b/test/box/on_schema_init.lua<br>index 17cf89166..f74d6d7fe 100644<br>--- a/test/box/on_schema_init.lua<br>+++ b/test/box/on_schema_init.lua<br>@@ -1,5 +1,5 @@<br> #!/usr/bin/env tarantool<br>-os = require('os')<br>+local os = require('os')<br> <br> function test_before_replace_trig(old, new)<br> -- return multiple values so that the stack fills earlier.<br>diff --git a/test/box/proxy.lua b/test/box/proxy.lua<br>index 8bbd505f8..c763e9634 100644<br>--- a/test/box/proxy.lua<br>+++ b/test/box/proxy.lua<br>@@ -1,5 +1,5 @@<br> #!/usr/bin/env tarantool<br>-os = require('os')<br>+local os = require('os')<br> <br> box.cfg{<br> listen = os.getenv("LISTEN"),<br>diff --git a/test/box/tiny.lua b/test/box/tiny.lua<br>index 04b523fb2..608d48366 100644<br>--- a/test/box/tiny.lua<br>+++ b/test/box/tiny.lua<br>@@ -1,5 +1,5 @@<br> #!/usr/bin/env tarantool<br>-os = require('os')<br>+local os = require('os')<br> <br> box.cfg{<br> listen = os.getenv("LISTEN"),<br>diff --git a/test/box/tree_pk.result b/test/box/tree_pk.result<br>index df3c78bed..4489d8cd9 100644<br>--- a/test/box/tree_pk.result<br>+++ b/test/box/tree_pk.result<br>@@ -27,7 +27,7 @@ box.snapshot()<br> ---<br> - ok<br> ...<br>-i0:bsize() > bsize<br>+assert(i0:bsize() > bsize)<br> ---<br> - true<br> ...<br>@@ -153,8 +153,8 @@ test_run:cmd("setopt delimiter ';'")<br> ...<br> function crossjoin(space0, space1, limit)<br> local result = {}<br>- for state, v0 in space0:pairs() do<br>- for state, v1 in space1:pairs() do<br>+ for _, v0 in space0:pairs() do<br>+ for _, v1 in space1:pairs() do<br> if limit <= 0 then<br> return result<br> end<br>diff --git a/test/box/tree_pk.test.lua b/test/box/tree_pk.test.lua<br>index 1190ab424..bc3784a98 100644<br>--- a/test/box/tree_pk.test.lua<br>+++ b/test/box/tree_pk.test.lua<br>@@ -11,7 +11,7 @@ box.snapshot()<br> s0:insert{2, 'tuple 2'}<br> box.snapshot()<br> <br>-i0:bsize() > bsize<br>+assert(i0:bsize() > bsize)<br> <br> s0:insert{3, 'tuple 3'}<br> s0.index['primary']:get{1}<br>@@ -58,8 +58,8 @@ test_run = env.new()<br> test_run:cmd("setopt delimiter ';'")<br> function crossjoin(space0, space1, limit)<br> local result = {}<br>- for state, v0 in space0:pairs() do<br>- for state, v1 in space1:pairs() do<br>+ for _, v0 in space0:pairs() do<br>+ for _, v1 in space1:pairs() do<br> if limit <= 0 then<br> return result<br> end<br>diff --git a/test/engine/tree_min_max_count.result b/test/engine/tree_min_max_count.result<br>index f55732aa6..9f1595a20 100644<br>--- a/test/engine/tree_min_max_count.result<br>+++ b/test/engine/tree_min_max_count.result<br>@@ -1189,7 +1189,7 @@ space6:drop()<br> ---<br> ...<br> -- min max count after many inserts<br>-string = require('string')<br>+local string = require('string')<br> ---<br> ...<br> space7 = box.schema.space.create('space7', { engine = engine })<br>diff --git a/test/engine/tree_min_max_count.test.lua b/test/engine/tree_min_max_count.test.lua<br>index 0633c56b3..19b5fe92d 100644<br>--- a/test/engine/tree_min_max_count.test.lua<br>+++ b/test/engine/tree_min_max_count.test.lua<br>@@ -337,7 +337,7 @@ space6:drop()<br> <br> -- min max count after many inserts<br> <br>-string = require('string')<br>+local string = require('string')<br> <br> space7 = box.schema.space.create('space7', { engine = engine })<br> index7 = space7:create_index('primary', { type = 'tree', parts = {1, 'scalar'} })<br>diff --git a/test/replication-py/master.lua b/test/replication-py/master.lua<br>index e924b5495..b43bafd54 100644<br>--- a/test/replication-py/master.lua<br>+++ b/test/replication-py/master.lua<br>@@ -1,5 +1,5 @@<br> #!/usr/bin/env tarantool<br>-os = require('os')<br>+local os = require('os')<br> box.cfg({<br> listen = os.getenv("LISTEN"),<br> memtx_memory = 107374182,<br>diff --git a/test/replication-py/panic.lua b/test/replication-py/panic.lua<br>index 75a738cbb..e72d11419 100644<br>--- a/test/replication-py/panic.lua<br>+++ b/test/replication-py/panic.lua<br>@@ -1,5 +1,5 @@<br> #!/usr/bin/env tarantool<br>-os = require('os')<br>+local os = require('os')<br> box.cfg({<br> listen = os.getenv("LISTEN"),<br> memtx_memory = 107374182,<br>diff --git a/test/replication/master.lua b/test/replication/master.lua<br>index e924b5495..b43bafd54 100644<br>--- a/test/replication/master.lua<br>+++ b/test/replication/master.lua<br>@@ -1,5 +1,5 @@<br> #!/usr/bin/env tarantool<br>-os = require('os')<br>+local os = require('os')<br> box.cfg({<br> listen = os.getenv("LISTEN"),<br> memtx_memory = 107374182,<br>diff --git a/test/replication/replicaset_ro_mostly.result b/test/replication/replicaset_ro_mostly.result<br>index a471779d3..e509e0da0 100644<br>--- a/test/replication/replicaset_ro_mostly.result<br>+++ b/test/replication/replicaset_ro_mostly.result<br>@@ -35,7 +35,7 @@ test_run:cmd("setopt delimiter ';'")<br> - true<br> ...<br> function create_cluster_uuid(servers, uuids)<br>- for i, name in ipairs(servers) do<br>+ for _, name in ipairs(servers) do<br> test_run:cmd(create_cluster_cmd1:format(name, name))<br> end<br> for i, name in ipairs(servers) do<br>diff --git a/test/replication/replicaset_ro_mostly.test.lua b/test/replication/replicaset_ro_mostly.test.lua<br>index 19cd1fe4a..e06e29c8e 100644<br>--- a/test/replication/replicaset_ro_mostly.test.lua<br>+++ b/test/replication/replicaset_ro_mostly.test.lua<br>@@ -16,7 +16,7 @@ create_cluster_cmd2 = 'start server %s with args="%s", wait_load=False, wait=Fal<br> <br> test_run:cmd("setopt delimiter ';'")<br> function create_cluster_uuid(servers, uuids)<br>- for i, name in ipairs(servers) do<br>+ for _, name in ipairs(servers) do<br> test_run:cmd(create_cluster_cmd1:format(name, name))<br> end<br> for i, name in ipairs(servers) do<br>diff --git a/test/sql-tap/analyze3.test.lua b/test/sql-tap/analyze3.test.lua<br>index dcbea1da5..5c9c28601 100755<br>--- a/test/sql-tap/analyze3.test.lua<br>+++ b/test/sql-tap/analyze3.test.lua<br>@@ -23,15 +23,15 @@ testprefix = "analyze3"<br> ------------------------------------------------------------------------<br> -- Test Organization:<br> --<br>--- analyze3-1.*: Test that the values of bound parameters are considered<br>+-- analyze3-1.*: Test that the values of bound parameters are considered<br> -- in the same way as constants when planning queries that<br> -- use range constraints.<br> --<br>--- analyze3-2.*: Test that the values of bound parameters are considered<br>+-- analyze3-2.*: Test that the values of bound parameters are considered<br> -- in the same way as constants when planning queries that<br> -- use LIKE expressions in the WHERE clause.<br> --<br>--- analyze3-3.*: Test that binding to a variable does not invalidate the<br>+-- analyze3-3.*: Test that binding to a variable does not invalidate the<br> -- query plan when there is no way in which replanning the<br> -- query may produce a superior outcome.<br> --<br>diff --git a/test/sql-tap/analyze9.test.lua b/test/sql-tap/analyze9.test.lua<br>index 02eb49f69..7412ba5fe 100755<br>--- a/test/sql-tap/analyze9.test.lua<br>+++ b/test/sql-tap/analyze9.test.lua<br>@@ -609,7 +609,7 @@ test:do_execsql_test(<br> test:do_test(<br> "10.1.2",<br> function()<br>- local a = 0<br>+ local a<br> for i = 1, 100 do<br> if i > 90 then<br> a = i<br>@@ -657,7 +657,7 @@ test:do_execsql_test(<br> test:do_test(<br> "10.2.2",<br> function()<br>- local a = 0<br>+ local a<br> for i = 1, 100 do<br> if i > 90 then<br> a = i<br>@@ -711,7 +711,7 @@ test:do_execsql_test(<br> test:do_test(<br> 11.1,<br> function()<br>- local a = 0<br>+ local a<br> for i = 0, 100 do<br> if i % 10 == 0 then<br> a = "\"ABC\""<br>@@ -762,7 +762,7 @@ test:do_execsql_test(<br> test:do_test(<br> 11.5,<br> function()<br>- local a = 0<br>+ local a<br> for i = 0, 100 do<br> if i % 10 == 0 then<br> a = "\"ABC\""<br>@@ -823,7 +823,7 @@ test:do_execsql_test(<br> test:do_test(<br> 12.1,<br> function()<br>- local a = 0<br>+ local a<br> for i = 0, 100 do<br> if i % 10 == 0 then<br> a = "\"ABC\""<br>@@ -874,7 +874,7 @@ test:do_execsql_test(<br> test:do_test(<br> 12.5,<br> function()<br>- local a = 0<br>+ local a<br> for i = 0, 100 do<br> if i % 10 == 0 then<br> a = "\"ABC\""<br>@@ -931,7 +931,7 @@ test:do_test(<br> test:execsql("CREATE TABLE t1(id INTEGER PRIMARY KEY AUTOINCREMENT, a TEXT, b INT, c INT, d INT);")<br> test:execsql("CREATE INDEX i1 ON t1(a);")<br> test:execsql("CREATE INDEX i2 ON t1(b, c);")<br>- local a = 0<br>+ local a<br> for i = 0, 100 do<br> if i % 2 == 1 then<br> a = "\"abc\""<br>@@ -1161,7 +1161,7 @@ test:do_test(<br> INSERT INTO t1 SELECT null, 2*a,2*b,2*c,d FROM t1;<br> INSERT INTO t1 SELECT null, 2*a,2*b,2*c,d FROM t1;<br> ]])<br>- local b = 0<br>+ local b<br> for i = 0, 31 do<br> if (i < 8) then<br> b = 0<br>diff --git a/test/sql-tap/gh-4077-iproto-execute-no-bind.test.lua b/test/sql-tap/gh-4077-iproto-execute-no-bind.test.lua<br>index d4b597e35..2f71a68ea 100755<br>--- a/test/sql-tap/gh-4077-iproto-execute-no-bind.test.lua<br>+++ b/test/sql-tap/gh-4077-iproto-execute-no-bind.test.lua<br>@@ -41,10 +41,11 @@ local size = msgpack.encode(header:len() + body:len())<br> sock:write(size .. header .. body)<br> <br> -- Read response.<br>-local size = msgpack.decode(sock:read(5))<br>+size = msgpack.decode(sock:read(5))<br> local header_body = sock:read(size)<br>-local header, header_len = msgpack.decode(header_body)<br>-local body = msgpack.decode(header_body:sub(header_len))<br>+local header_len<br>+header, header_len = msgpack.decode(header_body)<br>+body = msgpack.decode(header_body:sub(header_len))<br> sock:close()<br> <br> -- Verify response.<br>diff --git a/test/sql-tap/index1.test.lua b/test/sql-tap/index1.test.lua<br>index e173e685c..4c4a37ca7 100755<br>--- a/test/sql-tap/index1.test.lua<br>+++ b/test/sql-tap/index1.test.lua<br>@@ -106,7 +106,6 @@ test:do_test(<br> test:do_test(<br> "index-2.2",<br> function()<br>- local msg<br> local v , msg= pcall(function()<br> test:execsql("CREATE INDEX index1 ON test1(f1, f2, f4, f3)")<br> end)<br>diff --git a/test/sql-tap/join3.test.lua b/test/sql-tap/join3.test.lua<br>index 876b3121a..030fbaba3 100755<br>--- a/test/sql-tap/join3.test.lua<br>+++ b/test/sql-tap/join3.test.lua<br>@@ -49,7 +49,7 @@ for N=1, bitmask_size do<br> end<br> -- Joins with a comparison<br> --<br>-local result = {}<br>+result = {}<br> --for _ in X(0, "X!for", [=[["set N 1","$N<=$bitmask_size","incr N"]]=]) do<br> for N=1, bitmask_size do<br> table.insert(result,N)<br>diff --git a/test/sql-tap/select9.test.lua b/test/sql-tap/select9.test.lua<br>index 1ae16a658..bcc270593 100755<br>--- a/test/sql-tap/select9.test.lua<br>+++ b/test/sql-tap/select9.test.lua<br>@@ -60,10 +60,8 @@ function subrange(t, first, last)<br> end<br> <br> local function test_compound_select(testname, sql, result)<br>- local nCol = 1<br> local A = box.execute(sql) --test.box(sql)<br>- nCol = #A.metadata<br>- A = A.rows<br>+ local nCol = #A.metadata<br> local nRow = #result / nCol<br> local compound_sql = sql<br> test:do_execsql_test(<br>@@ -274,10 +272,8 @@ test:do_execsql_test(<br> -- </select9-2.0><br> })<br> <br>-local t1_space_id = ""<br>-local t2_space_id = ""<br>-t1_space_id = test:execsql([[SELECT * from "_space" where "name"='T1']])["id"]<br>-t2_space_id = test:execsql([[SELECT * from "_space" where "name"='T2']])["id"]<br>+local t1_space_id = test:execsql([[SELECT * from "_space" where "name"='T1']])["id"]<br>+local t2_space_id = test:execsql([[SELECT * from "_space" where "name"='T2']])["id"]<br> --X(276, "X!cmd", [=[["db","eval","SELECT * from _space where name='t2'","data","\n set t2_space_id $data(id)\n"]]=])<br> --local function reverse(lhs, rhs)<br> -- return X(283, "X!cmd", [=[["string","compare",["rhs"],["lhs"]]]=])<br>diff --git a/test/sql-tap/tkt-fa7bf5ec.test.lua b/test/sql-tap/tkt-fa7bf5ec.test.lua<br>index 7152e028c..25d44c9d3 100755<br>--- a/test/sql-tap/tkt-fa7bf5ec.test.lua<br>+++ b/test/sql-tap/tkt-fa7bf5ec.test.lua<br>@@ -20,9 +20,9 @@ test:plan(1)<br> -- The problem described by this ticket was that the sqlExprCompare()<br> -- function was saying that expressions (x='a') and (x='A') were identical<br> -- because it was using sqlStrICmp() instead of strcmp() to compare string<br>--- literals. That was causing the query optimizer for aggregate queries to<br>--- believe that both count() operations were identical, and thus only<br>--- computing the first count() and making a copy of the result for the<br>+-- literals. That was causing the query optimizer for aggregate queries to<br>+-- believe that both count() operations were identical, and thus only<br>+-- computing the first count() and making a copy of the result for the<br> -- second count().<br> --<br> -- ["set","testdir",[["file","dirname",["argv0"]]]]<br>diff --git a/test/sql-tap/where2.test.lua b/test/sql-tap/where2.test.lua<br>index f267be8e6..f2db6fcee 100755<br>--- a/test/sql-tap/where2.test.lua<br>+++ b/test/sql-tap/where2.test.lua<br>@@ -115,7 +115,7 @@ local function queryplan(sql)<br> table.insert(data, tab)<br> table.insert(data, idx)<br> else<br>- as, tab = string.match(v, "TABLE (%w+ AS) (%w+)")<br>+ _, tab = string.match(v, "TABLE (%w+ AS) (%w+)")<br> if tab == nil then<br> tab = string.match(v, "TABLE (%w+)")<br> end<br>diff --git a/test/sql/lua/sql_tokenizer.lua b/test/sql/lua/sql_tokenizer.lua<br>index 9922d792d..ffe4fb4e8 100644<br>--- a/test/sql/lua/sql_tokenizer.lua<br>+++ b/test/sql/lua/sql_tokenizer.lua<br>@@ -134,7 +134,7 @@ end<br> -- @retval Token type. If the rest of the SQL request consists of<br> -- spaces and comments, then return TK_EMPTY.<br> local function get_next_token(context)<br>- local c = ''<br>+ local c<br> repeat<br> local i = context.offset<br> c = context.sql:sub(i, i)<br>diff --git a/test/sql/savepoints.result b/test/sql/savepoints.result<br>index 509c33e59..b0915f398 100644<br>--- a/test/sql/savepoints.result<br>+++ b/test/sql/savepoints.result<br>@@ -102,12 +102,12 @@ collision_sv_2 = function()<br> box.begin()<br> box.execute('SAVEPOINT t1;')<br> box.execute('SAVEPOINT t2;')<br>- local _,err = box.execute('SAVEPOINT t1;')<br>+ local _, err = box.execute('SAVEPOINT t1;')<br> assert(err == nil)<br> box.execute('RELEASE SAVEPOINT t1;')<br>- local _,err = box.execute('RELEASE SAVEPOINT t1;')<br>+ _, err = box.execute('RELEASE SAVEPOINT t1;')<br> assert(err ~= nil)<br>- local _, err = box.execute('ROLLBACK TO t2;')<br>+ _, err = box.execute('ROLLBACK TO t2;')<br> assert(err == nil)<br> end;<br> ---<br>diff --git a/test/sql/savepoints.test.lua b/test/sql/savepoints.test.lua<br>index f1b15c748..eb7bea37d 100644<br>--- a/test/sql/savepoints.test.lua<br>+++ b/test/sql/savepoints.test.lua<br>@@ -65,12 +65,12 @@ collision_sv_2 = function()<br> box.begin()<br> box.execute('SAVEPOINT t1;')<br> box.execute('SAVEPOINT t2;')<br>- local _,err = box.execute('SAVEPOINT t1;')<br>+ local _, err = box.execute('SAVEPOINT t1;')<br> assert(err == nil)<br> box.execute('RELEASE SAVEPOINT t1;')<br>- local _,err = box.execute('RELEASE SAVEPOINT t1;')<br>+ _, err = box.execute('RELEASE SAVEPOINT t1;')<br> assert(err ~= nil)<br>- local _, err = box.execute('ROLLBACK TO t2;')<br>+ _, err = box.execute('ROLLBACK TO t2;')<br> assert(err == nil)<br> end;<br> collision_sv_2();<br>diff --git a/test/sql/triggers.result b/test/sql/triggers.result<br>index ceecb8ef2..e70d72947 100644<br>--- a/test/sql/triggers.result<br>+++ b/test/sql/triggers.result<br>@@ -11,7 +11,7 @@ _ = box.space._session_settings:update('sql_default_engine', {{'=', 2, engine}})<br> ---<br> ...<br> -- Get invariant part of the tuple; name and opts don't change.<br>- function immutable_part(data) local r = {} for i, l in pairs(data) do table.insert(r, {l.name, l.opts}) end return r end<br>+ function immutable_part(data) local r = {} for _, l in pairs(data) do table.insert(r, {l.name, l.opts}) end return r end<br> ---<br> ...<br> --<br>diff --git a/test/sql/triggers.test.lua b/test/sql/triggers.test.lua<br>index f5c8a3961..bc694ebc4 100644<br>--- a/test/sql/triggers.test.lua<br>+++ b/test/sql/triggers.test.lua<br>@@ -4,7 +4,7 @@ engine = test_run:get_cfg('engine')<br> _ = box.space._session_settings:update('sql_default_engine', {{'=', 2, engine}})<br> <br> -- Get invariant part of the tuple; name and opts don't change.<br>- function immutable_part(data) local r = {} for i, l in pairs(data) do table.insert(r, {l.name, l.opts}) end return r end<br>+ function immutable_part(data) local r = {} for _, l in pairs(data) do table.insert(r, {l.name, l.opts}) end return r end<br> <br> --<br> -- gh-3273: Move Triggers to server<br>diff --git a/test/vinyl/large.lua b/test/vinyl/large.lua<br>index e10e94c1a..a11642ff0 100644<br>--- a/test/vinyl/large.lua<br>+++ b/test/vinyl/large.lua<br>@@ -1,5 +1,5 @@<br>-fiber = require('fiber')<br>-digest = require('digest')<br>+local fiber = require('fiber')<br>+local digest = require('digest')<br> <br> local PAGE_SIZE = 1024<br> local RANGE_SIZE = 64 * PAGE_SIZE<br>diff --git a/test/vinyl/stat.result b/test/vinyl/stat.result<br>index d35def13d..914c2ede4 100644<br>--- a/test/vinyl/stat.result<br>+++ b/test/vinyl/stat.result<br>@@ -1792,13 +1792,15 @@ dump(1, 100) -- split + compaction<br> wait_compaction(3)<br> ---<br> ...<br>-i:stat().range_count -- 2<br>+assert(i:stat().range_count, 2)<br> ---<br> - 2<br>+- 2<br> ...<br>-i:stat().dumps_per_compaction -- 1<br>+assert(i:stat().dumps_per_compaction, 1)<br> ---<br> - 1<br>+- 1<br> ...<br> dump(1, 10)<br> ---<br>@@ -1809,9 +1811,10 @@ dump(1, 40) -- compaction in range 1<br> wait_compaction(4)<br> ---<br> ...<br>-i:stat().dumps_per_compaction -- 1<br>+assert(i:stat().dumps_per_compaction, 1)<br> ---<br> - 1<br>+- 1<br> ...<br> dump(90, 100)<br> ---<br>@@ -1822,9 +1825,10 @@ dump(60, 100) -- compaction in range 2<br> wait_compaction(5)<br> ---<br> ...<br>-i:stat().dumps_per_compaction -- 2<br>+assert(i:stat().dumps_per_compaction, 2)<br> ---<br> - 2<br>+- 2<br> ...<br> -- Forcing compaction manually doesn't affect dumps_per_compaction.<br> dump(40, 60)<br>@@ -1836,9 +1840,10 @@ i:compact()<br> wait_compaction(7)<br> ---<br> ...<br>-i:stat().dumps_per_compaction -- 2<br>+assert(i:stat().dumps_per_compaction, 2)<br> ---<br> - 2<br>+- 2<br> ...<br> test_run:cmd('restart server test')<br> fiber = require('fiber')<br>@@ -1853,9 +1858,10 @@ s = box.space.test<br> i = s.index.primary<br> ---<br> ...<br>-i:stat().dumps_per_compaction -- 2<br>+assert(i:stat().dumps_per_compaction, 2)<br> ---<br> - 2<br>+- 2<br> ...<br> for i = 1, 100 do s:replace{i, digest.urandom(100)} end<br> ---<br>@@ -1868,9 +1874,10 @@ test_run:wait_cond(function() return i:stat().disk.compaction.count == 2 end, 10<br> ---<br> - true<br> ...<br>-i:stat().dumps_per_compaction -- 1<br>+assert(i:stat().dumps_per_compaction, 1)<br> ---<br> - 1<br>+- 1<br> ...<br> s:drop()<br> ---<br>@@ -1892,9 +1899,10 @@ s:insert{1}<br> ---<br> - [1]<br> ...<br>-i:stat().txw.rows -- 1<br>+assert(i:stat().txw.rows, 1)<br> ---<br> - 1<br>+- 1<br> ...<br> sv = box.savepoint()<br> ---<br>@@ -1903,23 +1911,26 @@ s:insert{2}<br> ---<br> - [2]<br> ...<br>-i:stat().txw.rows -- 2<br>+assert(i:stat().txw.rows, 2)<br> ---<br> - 2<br>+- 2<br> ...<br> box.rollback_to_savepoint(sv)<br> ---<br> ...<br>-i:stat().txw.rows -- 1<br>+assert(i:stat().txw.rows, 1)<br> ---<br> - 1<br>+- 1<br> ...<br> box.commit()<br> ---<br> ...<br>-i:stat().txw.rows -- 0<br>+assert(i:stat().txw.rows, 0)<br> ---<br> - 0<br>+- 0<br> ...<br> s:drop()<br> ---<br>diff --git a/test/vinyl/stat.test.lua b/test/vinyl/stat.test.lua<br>index a8657ccf4..7ff2d95f3 100644<br>--- a/test/vinyl/stat.test.lua<br>+++ b/test/vinyl/stat.test.lua<br>@@ -555,24 +555,24 @@ i:stat().dumps_per_compaction -- 1<br> dump(1, 100) -- compaction<br> dump(1, 100) -- split + compaction<br> wait_compaction(3)<br>-i:stat().range_count -- 2<br>-i:stat().dumps_per_compaction -- 1<br>+assert(i:stat().range_count, 2)<br>+assert(i:stat().dumps_per_compaction, 1)<br> <br> dump(1, 10)<br> dump(1, 40) -- compaction in range 1<br> wait_compaction(4)<br>-i:stat().dumps_per_compaction -- 1<br>+assert(i:stat().dumps_per_compaction, 1)<br> <br> dump(90, 100)<br> dump(60, 100) -- compaction in range 2<br> wait_compaction(5)<br>-i:stat().dumps_per_compaction -- 2<br>+assert(i:stat().dumps_per_compaction, 2)<br> <br> -- Forcing compaction manually doesn't affect dumps_per_compaction.<br> dump(40, 60)<br> i:compact()<br> wait_compaction(7)<br>-i:stat().dumps_per_compaction -- 2<br>+assert(i:stat().dumps_per_compaction, 2)<br> <br> test_run:cmd('restart server test')<br> <br>@@ -582,12 +582,12 @@ digest = require('digest')<br> s = box.space.test<br> i = s.index.primary<br> <br>-i:stat().dumps_per_compaction -- 2<br>+assert(i:stat().dumps_per_compaction, 2)<br> for i = 1, 100 do s:replace{i, digest.urandom(100)} end<br> box.snapshot()<br> test_run:wait_cond(function() return i:stat().disk.compaction.count == 2 end, 10)<br> <br>-i:stat().dumps_per_compaction -- 1<br>+assert(i:stat().dumps_per_compaction, 1)<br> <br> s:drop()<br> <br>@@ -599,14 +599,14 @@ s = box.schema.space.create('test', {engine = 'vinyl'})<br> i = s:create_index('pk')<br> box.begin()<br> s:insert{1}<br>-i:stat().txw.rows -- 1<br>+assert(i:stat().txw.rows, 1)<br> sv = box.savepoint()<br> s:insert{2}<br>-i:stat().txw.rows -- 2<br>+assert(i:stat().txw.rows, 2)<br> box.rollback_to_savepoint(sv)<br>-i:stat().txw.rows -- 1<br>+assert(i:stat().txw.rows, 1)<br> box.commit()<br>-i:stat().txw.rows -- 0<br>+assert(i:stat().txw.rows, 0)<br> s:drop()<br> <br> test_run:cmd('switch default')<br>diff --git a/test/vinyl/txn_proxy.lua b/test/vinyl/txn_proxy.lua<br>index 7a4d0b865..15b0e4add 100644<br>--- a/test/vinyl/txn_proxy.lua<br>+++ b/test/vinyl/txn_proxy.lua<br>@@ -1,11 +1,11 @@<br>--- A fiber can't use multiple transactions simultaneously;<br>+-- A fiber can't use multiple transactions simultaneously;<br> -- i.e. [fiber] --? [transaction] in UML parlor.<br> --<br> -- This module provides a simple transaction proxy facility<br>--- to control multiple transactions at once. A proxy executes<br>+-- to control multiple transactions at once. A proxy executes<br> -- statements in a worker fiber in order to overcome<br> -- "one transaction per fiber" limitation.<br>---<br>+--<br> -- Ex:<br> -- proxy = require('txn_proxy').new()<br> -- proxy:begin()<br>diff --git a/test/vinyl/vinyl.lua b/test/vinyl/vinyl.lua<br>index 31307f4bc..02b5c010b 100644<br>--- a/test/vinyl/vinyl.lua<br>+++ b/test/vinyl/vinyl.lua<br>@@ -15,7 +15,7 @@ box.cfg {<br> vinyl_max_tuple_size = 1024 * 1024 * 6,<br> }<br> <br>-function box_info_sort(data)<br>+local function box_info_sort(data)<br> if type(data)~='table' then<br> return data<br> end<br>diff --git a/test/wal_off/rtree_benchmark.result b/test/wal_off/rtree_benchmark.result<br>index 8e01c9f2a..8deefca82 100644<br>--- a/test/wal_off/rtree_benchmark.result<br>+++ b/test/wal_off/rtree_benchmark.result<br>@@ -163,7 +163,7 @@ for i = 1, 0 do<br> for j = 1, dimension do<br> table.insert(rect, 180*math.random())<br> end<br>- for k,v in pairs(s.index.spatial:select(rect, {limit = n_neighbors, iterator = 'NEIGHBOR'})) do<br>+ for _,_ in pairs(s.index.spatial:select(rect, {limit = n_neighbors, iterator = 'NEIGHBOR'})) do<br> n = n + 1<br> end<br> end;<br>diff --git a/test/wal_off/rtree_benchmark.test.lua b/test/wal_off/rtree_benchmark.test.lua<br>index 6fae977c9..6bdc0a758 100644<br>--- a/test/wal_off/rtree_benchmark.test.lua<br>+++ b/test/wal_off/rtree_benchmark.test.lua<br>@@ -96,7 +96,7 @@ for i = 1, 0 do<br> for j = 1, dimension do<br> table.insert(rect, 180*math.random())<br> end<br>- for k,v in pairs(s.index.spatial:select(rect, {limit = n_neighbors, iterator = 'NEIGHBOR'})) do<br>+ for _,_ in pairs(s.index.spatial:select(rect, {limit = n_neighbors, iterator = 'NEIGHBOR'})) do<br> n = n + 1<br> end<br> end;<br>diff --git a/test/xlog-py/box.lua b/test/xlog-py/box.lua<br>index c87f7b94b..8b9e9434f 100644<br>--- a/test/xlog-py/box.lua<br>+++ b/test/xlog-py/box.lua<br>@@ -1,5 +1,5 @@<br> #!/usr/bin/env tarantool<br>-os = require('os')<br>+local os = require('os')<br> <br> box.cfg{<br> listen = os.getenv("LISTEN"),<br>diff --git a/test/xlog/big_tx.result b/test/xlog/big_tx.result<br>index 48085031b..837a4b478 100644<br>--- a/test/xlog/big_tx.result<br>+++ b/test/xlog/big_tx.result<br>@@ -11,7 +11,7 @@ t = box.space.big_tx:insert({1, digest.urandom(512 * 1024)})<br> ---<br> ...<br> env:cmd('restart server default')<br>-#box.space.big_tx:select()<br>+assert(#box.space.big_tx:select())<br> ---<br> - 1<br> ...<br>diff --git a/test/xlog/big_tx.test.lua b/test/xlog/big_tx.test.lua<br>index b90a14a82..09624ed53 100644<br>--- a/test/xlog/big_tx.test.lua<br>+++ b/test/xlog/big_tx.test.lua<br>@@ -5,7 +5,7 @@ _ = box.schema.space.create('big_tx'):create_index('pk')<br> t = box.space.big_tx:insert({1, digest.urandom(512 * 1024)})<br> env:cmd('restart server default')<br> <br>-#box.space.big_tx:select()<br>+assert(#box.space.big_tx:select())<br> <br> box.space.big_tx:drop()<br> <br>diff --git a/test/xlog/checkpoint_daemon.result b/test/xlog/checkpoint_daemon.result<br>index 5be7124fe..dc806ea1d 100644<br>--- a/test/xlog/checkpoint_daemon.result<br>+++ b/test/xlog/checkpoint_daemon.result<br>@@ -118,11 +118,11 @@ wait_snapshot_gc(WAIT_COND_TIMEOUT)<br> ---<br> - true<br> ...<br>-#snaps == 2 or snaps<br>+assert(#snaps == 2 or snaps)<br> ---<br> - true<br> ...<br>-#xlogs > 0<br>+assert(#xlogs > 0)<br> ---<br> - true<br> ...<br>diff --git a/test/xlog/checkpoint_daemon.test.lua b/test/xlog/checkpoint_daemon.test.lua<br>index d3138f356..0ef3d89da 100644<br>--- a/test/xlog/checkpoint_daemon.test.lua<br>+++ b/test/xlog/checkpoint_daemon.test.lua<br>@@ -70,8 +70,8 @@ for i = 1, row_count_per_wal + 10 do space:insert { no } no = no + 1 end<br> wait_snapshot(WAIT_COND_TIMEOUT)<br> wait_snapshot_gc(WAIT_COND_TIMEOUT)<br> <br>-#snaps == 2 or snaps<br>-#xlogs > 0<br>+assert(#snaps == 2 or snaps)<br>+assert(#xlogs > 0)<br> <br> -- gh-2780: check that a last snapshot mtime will be changed at<br> -- least two times.<br>diff --git a/test/xlog/panic.lua b/test/xlog/panic.lua<br>index 2d4eb8d2e..0fa855421 100644<br>--- a/test/xlog/panic.lua<br>+++ b/test/xlog/panic.lua<br>@@ -1,5 +1,5 @@<br> #!/usr/bin/env tarantool<br>-os = require('os')<br>+local os = require('os')<br> <br> box.cfg{<br> listen = os.getenv("LISTEN"),<br>diff --git a/test/xlog/panic_on_wal_error.result b/test/xlog/panic_on_wal_error.result<br>index 22f14f912..7bdd5119a 100644<br>--- a/test/xlog/panic_on_wal_error.result<br>+++ b/test/xlog/panic_on_wal_error.result<br>@@ -19,7 +19,7 @@ _ = box.space.test:create_index('pk')<br> -- reopen xlog<br> --<br> test_run:cmd("restart server default")<br>-box.space.test ~= nil<br>+assert(box.space.test ~= nil)<br> ---<br> - true<br> ...<br>diff --git a/test/xlog/panic_on_wal_error.test.lua b/test/xlog/panic_on_wal_error.test.lua<br>index 2e95431c6..0a72bf44b 100644<br>--- a/test/xlog/panic_on_wal_error.test.lua<br>+++ b/test/xlog/panic_on_wal_error.test.lua<br>@@ -10,7 +10,7 @@ _ = box.space.test:create_index('pk')<br> -- reopen xlog<br> --<br> test_run:cmd("restart server default")<br>-box.space.test ~= nil<br>+assert(box.space.test ~= nil)<br> -- insert some stuff<br> --<br> box.space.test:auto_increment{'before snapshot'}<br>diff --git a/test/xlog/reader.result b/test/xlog/reader.result<br>index 9985aa2ac..74ac3579e 100644<br>--- a/test/xlog/reader.result<br>+++ b/test/xlog/reader.result<br>@@ -40,7 +40,7 @@ trun:cmd("setopt delimiter ';'")<br> ...<br> function collect_results(file)<br> local val = {}<br>- for k, v in xlog(file) do<br>+ for _, v in xlog(file) do<br> table.insert(val, setmetatable(v, { __serialize = "map"}))<br> end<br> return val<br>diff --git a/test/xlog/reader.test.lua b/test/xlog/reader.test.lua<br>index 327af54dd..707ba394b 100644<br>--- a/test/xlog/reader.test.lua<br>+++ b/test/xlog/reader.test.lua<br>@@ -21,7 +21,7 @@ pattern_ok_v13 = fio.pathjoin(pattern_prefix, "v13/")<br> trun:cmd("setopt delimiter ';'")<br> function collect_results(file)<br> local val = {}<br>- for k, v in xlog(file) do<br>+ for _, v in xlog(file) do<br> table.insert(val, setmetatable(v, { __serialize = "map"}))<br> end<br> return val<br>diff --git a/test/xlog/snap_io_rate.test.lua b/test/xlog/snap_io_rate.test.lua<br>index f71296269..5626ea1f4 100644<br>--- a/test/xlog/snap_io_rate.test.lua<br>+++ b/test/xlog/snap_io_rate.test.lua<br>@@ -9,6 +9,6 @@ for i = 0, 127 do box.space.snap:replace({i, digest.urandom(512 * 1024)}) end<br> t1 = fiber.time()<br> box.snapshot()<br> t2 = fiber.time()<br>-t2 - t1 > 64 / box.cfg.snap_io_rate_limit * 0.95<br>+assert(t2 - t1 > 64 / box.cfg.snap_io_rate_limit * 0.95)<br> <br> box.space.snap:drop()<br>diff --git a/test/xlog/transaction.result b/test/xlog/transaction.result<br>index 63adb0f25..376fea486 100644<br>--- a/test/xlog/transaction.result<br>+++ b/test/xlog/transaction.result<br>@@ -16,7 +16,7 @@ test_run:cmd("setopt delimiter ';'")<br> ...<br> function read_xlog(file)<br> local val = {}<br>- for k, v in xlog(file) do<br>+ for _, v in xlog(file) do<br> table.insert(val, setmetatable(v, { __serialize = "map"}))<br> end<br> return val<br>@@ -69,37 +69,37 @@ data = read_xlog(fio.pathjoin(box.cfg.wal_dir, string.rep('0', 20 - #lsn_str) ..<br> ---<br> ...<br> -- check nothing changed for single row transactions<br>-data[1].HEADER.tsn == nil and data[1].HEADER.commit == nil<br>+assert(data[1].HEADER.tsn == nil and data[1].HEADER.commit == nil)<br> ---<br> - true<br> ...<br>-data[2].HEADER.tsn == nil and data[2].HEADER.commit == nil<br>+assert(data[2].HEADER.tsn == nil and data[2].HEADER.commit == nil)<br> ---<br> - true<br> ...<br> -- check two row transaction<br>-data[3].HEADER.tsn == data[3].HEADER.lsn and data[3].HEADER.commit == nil<br>+assert(data[3].HEADER.tsn == data[3].HEADER.lsn and data[3].HEADER.commit == nil)<br> ---<br> - true<br> ...<br>-data[4].HEADER.tsn == data[3].HEADER.tsn and data[4].HEADER.commit == true<br>+assert(data[4].HEADER.tsn == data[3].HEADER.tsn and data[4].HEADER.commit == true)<br> ---<br> - true<br> ...<br> -- check four row transaction<br>-data[5].HEADER.tsn == data[5].HEADER.lsn and data[5].HEADER.commit == nil<br>+assert(data[5].HEADER.tsn == data[5].HEADER.lsn and data[5].HEADER.commit == nil)<br> ---<br> - true<br> ...<br>-data[6].HEADER.tsn == data[5].HEADER.tsn and data[6].HEADER.commit == nil<br>+assert(data[6].HEADER.tsn == data[5].HEADER.tsn and data[6].HEADER.commit == nil)<br> ---<br> - true<br> ...<br>-data[7].HEADER.tsn == data[5].HEADER.tsn and data[7].HEADER.commit == nil<br>+assert(data[7].HEADER.tsn == data[5].HEADER.tsn and data[7].HEADER.commit == nil)<br> ---<br> - true<br> ...<br>-data[8].HEADER.tsn == data[5].HEADER.tsn and data[8].HEADER.commit == true<br>+assert(data[8].HEADER.tsn == data[5].HEADER.tsn and data[8].HEADER.commit == true)<br> ---<br> - true<br> ...<br>diff --git a/test/xlog/transaction.test.lua b/test/xlog/transaction.test.lua<br>index 2d8090b4c..c196064ef 100644<br>--- a/test/xlog/transaction.test.lua<br>+++ b/test/xlog/transaction.test.lua<br>@@ -6,7 +6,7 @@ test_run = env.new()<br> test_run:cmd("setopt delimiter ';'")<br> function read_xlog(file)<br> local val = {}<br>- for k, v in xlog(file) do<br>+ for _, v in xlog(file) do<br> table.insert(val, setmetatable(v, { __serialize = "map"}))<br> end<br> return val<br>@@ -33,14 +33,14 @@ box.snapshot()<br> lsn_str = tostring(lsn)<br> data = read_xlog(fio.pathjoin(box.cfg.wal_dir, string.rep('0', 20 - #lsn_str) .. tostring(lsn_str) .. '.xlog'))<br> -- check nothing changed for single row transactions<br>-data[1].HEADER.tsn == nil and data[1].HEADER.commit == nil<br>-data[2].HEADER.tsn == nil and data[2].HEADER.commit == nil<br>+assert(data[1].HEADER.tsn == nil and data[1].HEADER.commit == nil)<br>+assert(data[2].HEADER.tsn == nil and data[2].HEADER.commit == nil)<br> -- check two row transaction<br>-data[3].HEADER.tsn == data[3].HEADER.lsn and data[3].HEADER.commit == nil<br>-data[4].HEADER.tsn == data[3].HEADER.tsn and data[4].HEADER.commit == true<br>+assert(data[3].HEADER.tsn == data[3].HEADER.lsn and data[3].HEADER.commit == nil)<br>+assert(data[4].HEADER.tsn == data[3].HEADER.tsn and data[4].HEADER.commit == true)<br> -- check four row transaction<br>-data[5].HEADER.tsn == data[5].HEADER.lsn and data[5].HEADER.commit == nil<br>-data[6].HEADER.tsn == data[5].HEADER.tsn and data[6].HEADER.commit == nil<br>-data[7].HEADER.tsn == data[5].HEADER.tsn and data[7].HEADER.commit == nil<br>-data[8].HEADER.tsn == data[5].HEADER.tsn and data[8].HEADER.commit == true<br>+assert(data[5].HEADER.tsn == data[5].HEADER.lsn and data[5].HEADER.commit == nil)<br>+assert(data[6].HEADER.tsn == data[5].HEADER.tsn and data[6].HEADER.commit == nil)<br>+assert(data[7].HEADER.tsn == data[5].HEADER.tsn and data[7].HEADER.commit == nil)<br>+assert(data[8].HEADER.tsn == data[5].HEADER.tsn and data[8].HEADER.commit == true)<br> box.space.test:drop()<br>diff --git a/test/xlog/xlog.lua b/test/xlog/xlog.lua<br>index 004096d2d..aaf1a0ae6 100644<br>--- a/test/xlog/xlog.lua<br>+++ b/test/xlog/xlog.lua<br>@@ -1,5 +1,5 @@<br> #!/usr/bin/env tarantool<br>-os = require('os')<br>+local os = require('os')<br> <br> box.cfg{<br> listen = os.getenv("LISTEN"),<br>--<br>2.23.0<br> </div></div></div></div></blockquote> <div> </div><div data-signature-widget="container"><div data-signature-widget="content"><div>--<br>Alexander Tikhonov</div></div></div><div> </div></div></BODY></HTML>