From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id BC36770310; Fri, 15 Jan 2021 15:00:43 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org BC36770310 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1610712043; bh=KDiJs0SeWenBlqnfmGS0XIHJr74s9LkjtArKecVS5Ls=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=S72wGMkqUUZNrwsXNLgG+j4U0ePln4+LaViem6bFejw3fGCrCzLucpVtu0NXoNf8o yATgHfUobE+8xWRU2HtkYHXmqyIxwey85s9pciC2xWxRfbE4ocq9qKkLM0ZvjHSLEF ol3sD0TxrW3y6m9QLlyhpR9Prkrc+FXYfOMXxkWc= Received: from smtpng3.m.smailru.net (smtpng3.m.smailru.net [94.100.177.149]) (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 E4D2B70310 for ; Fri, 15 Jan 2021 15:00:16 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org E4D2B70310 Received: by smtpng3.m.smailru.net with esmtpa (envelope-from ) id 1l0Nm4-0002yV-1V; Fri, 15 Jan 2021 15:00:16 +0300 To: tarantool-patches@dev.tarantool.org, v.shpilevoy@tarantool.org Date: Fri, 15 Jan 2021 15:00:06 +0300 Message-Id: <91e7d3b8ed61a4d68fcd6b1c956866139ae58c02.1610711373.git.sergeyb@tarantool.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9D0E79FBC973162CD520EA9A9E182CF906B1BCD0E5756442500894C459B0CD1B95C41638E3F61D73CCBEC67ABC0212EE095A620E87688B369F201547DC122CD43 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE77603ADE015AF816DEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063781BF90BB6B3E56078638F802B75D45FF5571747095F342E8C7A0BC55FA0FE5FCB836650DB3362DFF285F72BB15BC4044B7E7603BE4DB687C389733CBF5DBD5E913377AFFFEAFD269A417C69337E82CC2CC7F00164DA146DAFE8445B8C89999729449624AB7ADAF37F6B57BC7E64490611E7FA7ABCAF51C92176DF2183F8FC7C0D9442B0B5983000E8941B15DA834481F9449624AB7ADAF3735872C767BF85DA29E625A9149C048EE1B544F03EFBC4D57E4A630A5B664A4FF4AD6D5ED66289B524E70A05D1297E1BB35872C767BF85DA227C277FBC8AE2E8BC81139A5709D777F75ECD9A6C639B01B4E70A05D1297E1BBC6867C52282FAC85D9B7C4F32B44FF57285124B2A10EEC6C00306258E7E6ABB4E4A6367B16DE6309 X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CC8EA00DD1EB14C7FA517A2822BDE6DD6B385603A4C1A3E5E9C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF6EA1BA7CA28B4A74699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3438212F20E1E78D8E311628ADD2E282700CDF79A6BBBF853BBA29EA09F6BF5F8C0987165F919683911D7E09C32AA3244CCE0D70425A424A474AF1916FFFE865ACF2F5F14F68F1805B927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojT/h6YDL0UQ4O8ibjPFhcDg== X-Mailru-Sender: 689FA8AB762F73936BC43F508A0638227265579505F42C9BC836A4A192C52BF6DD788429FD8613638ED9BB8B05EE7B3AFB559BB5D741EB96D19CD4E7312BAA970A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v7 1/2] luacheck: fix warnings in test/engine X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Sergey Bronnikov via Tarantool-patches Reply-To: sergeyb@tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" From: Sergey Bronnikov Closes #5458 Reviewed-by: Vladislav Shpilevoy Reviewed-by: Igor Munkin Co-authored-by: Vladislav Shpilevoy Co-authored-by: Igor Munkin --- .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