From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp39.i.mail.ru (smtp39.i.mail.ru [94.100.177.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 07EB845BE34 for ; Fri, 29 May 2020 18:16:58 +0300 (MSK) From: sergeyb@tarantool.org Date: Fri, 29 May 2020 18:09:36 +0300 Message-Id: <29ce638be79d54c519cb79b5696d86794a81f19e.1590764168.git.sergeyb@tarantool.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH v6 22/25] Fix luacheck warnings in test/xlog List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tarantool-patches@dev.tarantool.org, v.shpilevoy@tarantool.org, imun@tarantool.org Cc: o.piskunov@tarantool.org, alexander.turenko@tarantool.org From: Sergey Bronnikov Part of #4681 Reviewed-by: Vladislav Shpilevoy Reviewed-by: Igor Munkin Co-authored-by: Vladislav Shpilevoy Co-authored-by: Igor Munkin --- .luacheckrc | 2 +- test/xlog/panic.lua | 2 +- test/xlog/reader.result | 2 +- test/xlog/reader.test.lua | 2 +- test/xlog/snap_io_rate.test.lua | 2 +- test/xlog/transaction.result | 2 +- test/xlog/transaction.test.lua | 2 +- .../upgrade/2.1.3/gh-4771-upgrade-sequence/fill.lua | 12 ++++++------ test/xlog/xlog.lua | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.luacheckrc b/.luacheckrc index a2ac96b68..c33af181f 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -17,7 +17,7 @@ exclude_files = { "test/var/**/*.lua", "test/vinyl/*.test.lua", "test/wal_off/*.test.lua", - "test/xlog/*.lua", + "test/xlog/*.test.lua", "test-run/**/*.lua", "third_party/**/*.lua", ".rocks/**/*.lua", diff --git a/test/xlog/panic.lua b/test/xlog/panic.lua index 2d4eb8d2e..0fa855421 100644 --- a/test/xlog/panic.lua +++ b/test/xlog/panic.lua @@ -1,5 +1,5 @@ #!/usr/bin/env tarantool -os = require('os') +local os = require('os') box.cfg{ listen = os.getenv("LISTEN"), diff --git a/test/xlog/reader.result b/test/xlog/reader.result index 9985aa2ac..74ac3579e 100644 --- a/test/xlog/reader.result +++ b/test/xlog/reader.result @@ -40,7 +40,7 @@ trun:cmd("setopt delimiter ';'") ... function collect_results(file) local val = {} - for k, v in xlog(file) do + for _, v in xlog(file) do table.insert(val, setmetatable(v, { __serialize = "map"})) end return val diff --git a/test/xlog/reader.test.lua b/test/xlog/reader.test.lua index 327af54dd..707ba394b 100644 --- a/test/xlog/reader.test.lua +++ b/test/xlog/reader.test.lua @@ -21,7 +21,7 @@ pattern_ok_v13 = fio.pathjoin(pattern_prefix, "v13/") trun:cmd("setopt delimiter ';'") function collect_results(file) local val = {} - for k, v in xlog(file) do + for _, v in xlog(file) do table.insert(val, setmetatable(v, { __serialize = "map"})) end return val diff --git a/test/xlog/snap_io_rate.test.lua b/test/xlog/snap_io_rate.test.lua index f71296269..5626ea1f4 100644 --- a/test/xlog/snap_io_rate.test.lua +++ b/test/xlog/snap_io_rate.test.lua @@ -9,6 +9,6 @@ for i = 0, 127 do box.space.snap:replace({i, digest.urandom(512 * 1024)}) end t1 = fiber.time() box.snapshot() t2 = fiber.time() -t2 - t1 > 64 / box.cfg.snap_io_rate_limit * 0.95 +assert(t2 - t1 > 64 / box.cfg.snap_io_rate_limit * 0.95) box.space.snap:drop() diff --git a/test/xlog/transaction.result b/test/xlog/transaction.result index 63adb0f25..d45b60b0a 100644 --- a/test/xlog/transaction.result +++ b/test/xlog/transaction.result @@ -16,7 +16,7 @@ test_run:cmd("setopt delimiter ';'") ... function read_xlog(file) local val = {} - for k, v in xlog(file) do + for _, v in xlog(file) do table.insert(val, setmetatable(v, { __serialize = "map"})) end return val diff --git a/test/xlog/transaction.test.lua b/test/xlog/transaction.test.lua index 2d8090b4c..5fdeec625 100644 --- a/test/xlog/transaction.test.lua +++ b/test/xlog/transaction.test.lua @@ -6,7 +6,7 @@ test_run = env.new() test_run:cmd("setopt delimiter ';'") function read_xlog(file) local val = {} - for k, v in xlog(file) do + for _, v in xlog(file) do table.insert(val, setmetatable(v, { __serialize = "map"})) end return val diff --git a/test/xlog/upgrade/2.1.3/gh-4771-upgrade-sequence/fill.lua b/test/xlog/upgrade/2.1.3/gh-4771-upgrade-sequence/fill.lua index b159f2b67..8e9a9d13d 100644 --- a/test/xlog/upgrade/2.1.3/gh-4771-upgrade-sequence/fill.lua +++ b/test/xlog/upgrade/2.1.3/gh-4771-upgrade-sequence/fill.lua @@ -1,14 +1,14 @@ box.cfg{} -s1 = box.schema.create_space('test1') -pk = s1:create_index('pk', {sequence = true}) +local s1 = box.schema.create_space('test1') +s1:create_index('pk', {sequence = true}) s1:replace{box.NULL} -seq2 = box.schema.sequence.create('seq2') -s2 = box.schema.create_space('test2') -pk = s2:create_index('pk', {sequence = 'seq2'}) +box.schema.sequence.create('seq2') +local s2 = box.schema.create_space('test2') +s2:create_index('pk', {sequence = 'seq2'}) s2:replace{box.NULL} -seq3 = box.schema.sequence.create('seq3') +local seq3 = box.schema.sequence.create('seq3') seq3:next() box.snapshot() diff --git a/test/xlog/xlog.lua b/test/xlog/xlog.lua index 004096d2d..aaf1a0ae6 100644 --- a/test/xlog/xlog.lua +++ b/test/xlog/xlog.lua @@ -1,5 +1,5 @@ #!/usr/bin/env tarantool -os = require('os') +local os = require('os') box.cfg{ listen = os.getenv("LISTEN"), -- 2.23.0