From: Sergey Bronnikov via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: tarantool-patches@dev.tarantool.org, v.shpilevoy@tarantool.org Subject: [Tarantool-patches] [PATCH v7 1/2] luacheck: fix warnings in test/engine Date: Fri, 15 Jan 2021 15:00:06 +0300 [thread overview] Message-ID: <91e7d3b8ed61a4d68fcd6b1c956866139ae58c02.1610711373.git.sergeyb@tarantool.org> (raw) In-Reply-To: <cover.1610711373.git.sergeyb@tarantool.org> From: Sergey Bronnikov <sergeyb@tarantool.org> Closes #5458 Reviewed-by: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> Reviewed-by: Igor Munkin <imun@tarantool.org> Co-authored-by: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> Co-authored-by: Igor Munkin <imun@tarantool.org> --- .luacheckrc | 2 +- test/engine/box.lua | 8 +------- test/engine/conflict.lua | 12 ++++++++---- test/engine/conflict.test.lua | 4 ++-- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/.luacheckrc b/.luacheckrc index b7f9abb45..d58fd57b0 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -39,7 +39,7 @@ exclude_files = { "test/box/lua/require_mod.lua", -- Unused source file, to be dropped (gh-5169). "test/box/lua/test_init.lua", - "test/engine/**/*.lua", + "test/engine/*.test.lua", "test/engine_long/**/*.lua", "test/long_run-py/**/*.lua", "test/luajit-tap/**/*.lua", diff --git a/test/engine/box.lua b/test/engine/box.lua index e2f04cba2..8558c9ac0 100644 --- a/test/engine/box.lua +++ b/test/engine/box.lua @@ -1,11 +1,5 @@ #!/usr/bin/env tarantool -os = require('os') - -local vinyl = { - threads = 3, - range_size=1024*64, - page_size=1024, -} +local os = require('os') box.cfg{ listen = os.getenv("LISTEN"), diff --git a/test/engine/conflict.lua b/test/engine/conflict.lua index b757b81d2..1f9fe5a45 100644 --- a/test/engine/conflict.lua +++ b/test/engine/conflict.lua @@ -1,11 +1,11 @@ -function test_conflict() +local function test_conflict() local test_run = require('test_run') local inspector = test_run.new() local engine = inspector:get_cfg('engine') local s = box.schema.space.create('tester', {engine=engine}); - local i = s:create_index('test_index', {type = 'tree', parts = {1, 'string'}}); + s:create_index('test_index', {type = 'tree', parts = {1, 'string'}}); local commits = 0 local function conflict() @@ -16,10 +16,14 @@ function test_conflict() end; local fiber = require('fiber'); - local f0 = fiber.create(conflict); - local f1 = fiber.create(conflict); -- conflict + fiber.create(conflict); + fiber.create(conflict); -- conflict fiber.sleep(0); s:drop(); return commits end + +return { + test_conflict = test_conflict; +} diff --git a/test/engine/conflict.test.lua b/test/engine/conflict.test.lua index d83c03a7a..7744b41b4 100644 --- a/test/engine/conflict.test.lua +++ b/test/engine/conflict.test.lua @@ -1,4 +1,4 @@ -dofile('conflict.lua') +conflict = require('conflict') -test_conflict() +conflict.test_conflict() -- 2.25.1
next prev parent reply other threads:[~2021-01-15 12:00 UTC|newest] Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-01-15 12:00 [Tarantool-patches] [PATCH v7 0/2] Fix luacheck warnings in test/engine and test/engine_long Sergey Bronnikov via Tarantool-patches 2021-01-15 12:00 ` Sergey Bronnikov via Tarantool-patches [this message] 2021-01-15 12:00 ` [Tarantool-patches] [PATCH v7 2/2] luacheck: fix warnings in test/engine_long Sergey Bronnikov via Tarantool-patches 2021-01-17 16:22 ` Vladislav Shpilevoy via Tarantool-patches 2021-01-18 8:54 ` Sergey Bronnikov via Tarantool-patches 2021-01-20 22:40 ` Vladislav Shpilevoy via Tarantool-patches 2021-01-21 15:36 ` [Tarantool-patches] [PATCH v7 0/2] Fix luacheck warnings in test/engine and test/engine_long Kirill Yukhin via Tarantool-patches
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=91e7d3b8ed61a4d68fcd6b1c956866139ae58c02.1610711373.git.sergeyb@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=sergeyb@tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v7 1/2] luacheck: fix warnings in test/engine' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox