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 1F52B7030C; Sun, 17 Jan 2021 19:22:57 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 1F52B7030C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1610900577; bh=RIcLSFVOgBERJOSx6VZnonKp31vbFSK4fkV1duCtvqU=; h=To:References:Date:In-Reply-To:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=hJInVnjFwXlOHAxhagWqJ0DIEN/yzNVrI1X7fMjBBa8jCJR1jmwW8+lPBnPvNo5nM 4X8MDLUOuw4rkNTCvGUoprO4sPjXyUlWpAKfX3xMRqEASBJmNmAmfcV+e3YFWGbXa7 +TvLS4V5msB2GpzQ2kmm5JaV8OljdO7oAszmAnJE= 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 C48F17030C for ; Sun, 17 Jan 2021 19:22:55 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org C48F17030C Received: by smtpng3.m.smailru.net with esmtpa (envelope-from ) id 1l1ApK-0005yr-Ac; Sun, 17 Jan 2021 19:22:55 +0300 To: sergeyb@tarantool.org, tarantool-patches@dev.tarantool.org References: Message-ID: <7ab993b8-d4e6-ba30-3a11-ac1a440ed26a@tarantool.org> Date: Sun, 17 Jan 2021 17:22:53 +0100 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.6.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD9D0E79FBC973162CD3BE40D5FE7B3134676ED03235248932300894C459B0CD1B9B660D1FE2CCEBD223F438229BBCC2ECC53A798F59094534CC77A06E522078DAD X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7E2331B2371EFE129EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637B2BC59D094D41B978638F802B75D45FF5571747095F342E8C7A0BC55FA0FE5FC198416FAB7BF40504F926D62F1D4E2AF89BFD59BAD79DB83389733CBF5DBD5E913377AFFFEAFD269A417C69337E82CC2CC7F00164DA146DAFE8445B8C89999729449624AB7ADAF3735872C767BF85DA29E625A9149C048EE0A3850AC1BE2E7355E97997F8902A7B94AD6D5ED66289B524E70A05D1297E1BB35872C767BF85DA227C277FBC8AE2E8BD198C2A7CB645D0575ECD9A6C639B01B4E70A05D1297E1BBC6867C52282FAC85D9B7C4F32B44FF57E8FBB06288C1946000306258E7E6ABB4E4A6367B16DE6309 X-C1DE0DAB: 0D63561A33F958A501B62457CBEBA45B239FA0D8961BB1B263B63B57FDD723CAD59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA758F9E841AEAEC4F2C410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34C53D1911AD7E41996CFC222002A511808F9C6A98DF0D6F6EDA5600DF38AD23569B1E4DCA285722DC1D7E09C32AA3244CC95619FF7556FC335F600FE4681B877DA8CE788DE6831205FACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojYu4DkwLgf0LLPPo/snnHDg== X-Mailru-Sender: 689FA8AB762F73936BC43F508A06382250E0A64B2A0DF81D8C64EC0C12E6C8DB3841015FED1DE5223CC9A89AB576DD93FB559BB5D741EB963CF37A108A312F5C27E8A8C3839CE0E267EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v7 2/2] luacheck: fix warnings in test/engine_long 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: Vladislav Shpilevoy via Tarantool-patches Reply-To: Vladislav Shpilevoy Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Hi! Thanks for the patch! > diff --git a/.luacheckrc b/.luacheckrc > index d58fd57b0..b581136b2 100644 > --- a/.luacheckrc > +++ b/.luacheckrc > @@ -176,3 +176,9 @@ files["test/box-tap/extended_error.test.lua"] = { > "forbidden_function", > }, > } > +files["test/engine_long/suite.lua"] = { > + globals = { > + "delete_replace_update", > + "delete_insert", There is no reason for these functions to be global. The only reason is being able to call a function via IPROTO_CALL, which is not the case here. I proper fix should make them local and returned as a result of require(): ==================== diff --git a/.luacheckrc b/.luacheckrc index 02349331e..8c67f9d47 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -131,9 +131,3 @@ files["test/box-tap/extended_error.test.lua"] = { "forbidden_function", }, } -files["test/engine_long/suite.lua"] = { - globals = { - "delete_replace_update", - "delete_insert", - } -} diff --git a/test/engine_long/box.lua b/test/engine_long/box.lua index 28a1560d5..94ae81301 100644 --- a/test/engine_long/box.lua +++ b/test/engine_long/box.lua @@ -1,7 +1,5 @@ #!/usr/bin/env tarantool -require('suite') - os.execute("rm -rf vinyl_test") os.execute("mkdir -p vinyl_test") diff --git a/test/engine_long/delete_insert.result b/test/engine_long/delete_insert.result index b1d504271..06085ca78 100644 --- a/test/engine_long/delete_insert.result +++ b/test/engine_long/delete_insert.result @@ -1,6 +1,9 @@ test_run = require('test_run') --- ... +delete_insert = require('suite').delete_insert +--- +... inspector = test_run.new() --- ... diff --git a/test/engine_long/delete_insert.test.lua b/test/engine_long/delete_insert.test.lua index 275aaa23e..b2c4ec308 100644 --- a/test/engine_long/delete_insert.test.lua +++ b/test/engine_long/delete_insert.test.lua @@ -1,4 +1,5 @@ test_run = require('test_run') +delete_insert = require('suite').delete_insert inspector = test_run.new() engine = inspector:get_cfg('engine') iterations = 100000 diff --git a/test/engine_long/delete_replace_update.result b/test/engine_long/delete_replace_update.result index 66cb9c82c..b12e00688 100644 --- a/test/engine_long/delete_replace_update.result +++ b/test/engine_long/delete_replace_update.result @@ -1,3 +1,6 @@ +delete_replace_update = require('suite').delete_replace_update +--- +... engine_name = 'memtx' --- ... diff --git a/test/engine_long/delete_replace_update.test.lua b/test/engine_long/delete_replace_update.test.lua index 466b8f007..e6906a94b 100644 --- a/test/engine_long/delete_replace_update.test.lua +++ b/test/engine_long/delete_replace_update.test.lua @@ -1,3 +1,4 @@ +delete_replace_update = require('suite').delete_replace_update engine_name = 'memtx' iterations = 100000 diff --git a/test/engine_long/suite.lua b/test/engine_long/suite.lua index 586160a1a..995257382 100644 --- a/test/engine_long/suite.lua +++ b/test/engine_long/suite.lua @@ -9,7 +9,7 @@ local function string_function() return random_string end -function delete_replace_update(engine_name, iterations) +local function delete_replace_update(engine_name, iterations) if (box.space._space.index.name:select{'tester'}[1] ~= nil) then box.space.tester:drop() end @@ -66,7 +66,7 @@ function delete_replace_update(engine_name, iterations) return {counter, random_number, string_value_2, string_value_3} end -function delete_insert(engine_name, iterations) +local function delete_insert(engine_name, iterations) if (box.space._space.index.name:select{'tester'}[1] ~= nil) then box.space.tester:drop() end @@ -104,4 +104,7 @@ function delete_insert(engine_name, iterations) return {counter, string_value_2} end -_G.protected_globals = {'delete_replace_update', 'delete_insert'} +return { + delete_replace_update = delete_replace_update, + delete_insert = delete_insert +}