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 0472070368; Mon, 18 Jan 2021 11:54:31 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 0472070368 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1610960071; bh=8LpB0h13so01pP/k1Xr5klbLK6OwoqDmcFECf7GgWLg=; 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=V/sidH6mI+YKaZHqnMJsF2lnBAmfpjmrOsl9vOeYzmPCLXEBUCQXP5PVV9gquvtwe 0JJcp3SOlrzO6SuXsniHbUxL4ycK+dMPmMan3tJ21nd+Es/EmH2nQ0cE0NmeiKGqfI k9mXGt96ZzHl/9wPQz3k+BVEXMEpt40KS3gGk9B0= Received: from smtpng2.m.smailru.net (smtpng2.m.smailru.net [94.100.179.3]) (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 AB96E70368 for ; Mon, 18 Jan 2021 11:54:29 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org AB96E70368 Received: by smtpng2.m.smailru.net with esmtpa (envelope-from ) id 1l1QIu-00021E-Dr; Mon, 18 Jan 2021 11:54:28 +0300 To: Vladislav Shpilevoy , tarantool-patches@dev.tarantool.org References: <7ab993b8-d4e6-ba30-3a11-ac1a440ed26a@tarantool.org> Message-ID: Date: Mon, 18 Jan 2021 11:54:28 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <7ab993b8-d4e6-ba30-3a11-ac1a440ed26a@tarantool.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9D0E79FBC973162CDDA1A336500443B3AD46BC604C28ED16A00894C459B0CD1B9ADC09B0367BAC0DBD75CEF83B6694C692061B46615F03E52467020CA3B4CCCD9 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE77C1346FE4B18DC51EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637DB576DCB83B448D28638F802B75D45FF5571747095F342E8C7A0BC55FA0FE5FC1EBDB4CB4B3C098256A6DFD0A6855A7B6EA430460B6EB7CE389733CBF5DBD5E913377AFFFEAFD269A417C69337E82CC2CC7F00164DA146DAFE8445B8C89999729449624AB7ADAF3735872C767BF85DA29E625A9149C048EE0A3850AC1BE2E735CCFFBAE954C2DE444AD6D5ED66289B524E70A05D1297E1BB35872C767BF85DA227C277FBC8AE2E8BF1C7286092EE445175ECD9A6C639B01B4E70A05D1297E1BBC6867C52282FAC85D9B7C4F32B44FF57285124B2A10EEC6C00306258E7E6ABB4E4A6367B16DE6309 X-C1DE0DAB: 0D63561A33F958A5F51DE759549D5D7B8FC2C481DB2F2BCD197D83F9E68D6781D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA758F9E841AEAEC4F2C410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3483E1FCD56FEA62E6B7860AFDD1B1E62A7D05D740B7F628ECCC24742A4C609BF5DB48758A85D881261D7E09C32AA3244C1F3D450E3EC8F42C9CFF75D11DE9F4953A76366E8A9DE7CAFACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojYu4DkwLgf0LEFxqO3ezfnA== X-Mailru-Sender: 689FA8AB762F73936BC43F508A06382288EA77CAA1BEE1C7C1AF02704DC1806EDD788429FD8613638ED9BB8B05EE7B3AFB559BB5D741EB96D19CD4E7312BAA970A04DAD6CC59E33667EA787935ED9F1B 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: Sergey Bronnikov via Tarantool-patches Reply-To: Sergey Bronnikov Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Thanks for review and proposed diff! It was applied without changes from my side and force pushed. CI: https://gitlab.com/tarantool/tarantool/-/pipelines/243025033 On 17.01.2021 19:22, Vladislav Shpilevoy wrote: > 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 > +}