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 12A297030C; Sat, 16 Jan 2021 01:11:00 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 12A297030C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1610748660; bh=9znN703c4dcS4C/iwhknyxl/vtOgqr8W6U104TjLQYc=; 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=VGjeBfmhkp6oeWh4ze16iKnYGjMJRI+V7Qr2Ff0vDX3RmUvly0mTipkgnMs8kfx5w 0BvoriJivNwJNqklXRhVkWmIKJljuqai/hfIXrAMYh/tgGc4FMf9F3gRflTKpFuaz2 glIsVGzD4hIXiY1UtZOPzyQWgGRG5Ao1FvDiH5Sk= 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 F233E7030C for ; Sat, 16 Jan 2021 01:10:58 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org F233E7030C Received: by smtpng3.m.smailru.net with esmtpa (envelope-from ) id 1l0XJ4-0006zw-62; Sat, 16 Jan 2021 01:10:58 +0300 To: sergeyb@tarantool.org, tarantool-patches@dev.tarantool.org References: Message-ID: <4c2cde7b-d6c1-2412-a067-361cd722d8c9@tarantool.org> Date: Fri, 15 Jan 2021 23:10:57 +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: 4F1203BC0FB41BD9D0E79FBC973162CDDA1A336500443B3AD46BC604C28ED16A00894C459B0CD1B979483700F4960AFC4FA6FA9A53CE889531A4AD3B306D7E38E54C7BE71C4A8023 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7A3295C83650092F9EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063745D431239A8C7DA08638F802B75D45FF5571747095F342E8C7A0BC55FA0FE5FCEEF43995C8927AC23ED580F107BEDDDAAE441D0F3477D75D389733CBF5DBD5E913377AFFFEAFD269176DF2183F8FC7C0A29E2F051442AF778941B15DA834481FCF19DD082D7633A0C77107234E2CFBA567F23339F89546C55F5C1EE8F4F765FCEAEC63207C9EE93C75ECD9A6C639B01BBD4B6F7A4D31EC0BC0CAF46E325F83A522CA9DD8327EE4931B544F03EFBC4D57026D3A1080F4EF5CC4224003CC836476C0CAF46E325F83A50BF2EBBBDD9D6B0F93F060FBA3C93C613B503F486389A921A5CC5B56E945C8DA X-C1DE0DAB: 0D63561A33F958A54797724E6AA773DAD2B8A16753C2323CFF0E53B24AF1D1FAD59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA75448CF9D3A7B2C848410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D341E08D7EE1804B7633AF9DE843499BE6432EF608B25A15238469657F91DEB59D6C37AC5F059AD37701D7E09C32AA3244CFCD1B261E4F3A952F734828CBAFAFBBF97FE24653F78E668FACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojT/h6YDL0UQ4vJzMMBCa6zQ== X-Mailru-Sender: 689FA8AB762F73936BC43F508A063822C6C91CA5E70EFECBA2E56589B6A2CCF23841015FED1DE5223CC9A89AB576DD93FB559BB5D741EB963CF37A108A312F5C27E8A8C3839CE0E267EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v7 2/2] test: fix luacheck warnings in test/sql-tap 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/test/sql-tap/with2.test.lua b/test/sql-tap/with2.test.lua > index 456ded363..cdf1d75a2 100755 > --- a/test/sql-tap/with2.test.lua > +++ b/test/sql-tap/with2.test.lua > @@ -386,22 +386,22 @@ genstmt(255), { > -- Check that adding a WITH clause to an INSERT disables the xfer > -- optimization. > > -local function do_xfer_test(test, test_func, test_name, func, exp, opts) > - local opts = opts or {} > +local function do_xfer_test(test_arg, test_func, test_name, func, exp, opts) > + opts = opts or {} > local exp_xfer_count = opts.exp_xfer_count > local before = box.stat.sql().sql_xfer_count > - test_func(test, test_name, func, exp) > + test_func(test_arg, test_name, func, exp) > local after = box.stat.sql().sql_xfer_count > test:is(after - before, exp_xfer_count, > test_name .. '-xfer-count') > end > > -test.do_execsql_xfer_test = function(test, test_name, func, exp, opts) > - do_xfer_test(test, test.do_execsql_test, test_name, func, exp, opts) > +test.do_execsql_xfer_test = function(test_arg, test_name, func, exp, opts) > + do_xfer_test(test_arg, test_arg.do_execsql_test, test_name, func, exp, opts) > end > > -test.do_catchsql_xfer_test = function(test, test_name, func, exp, opts) > - do_xfer_test(test, test.do_catchsql_test, test_name, func, exp, opts) > +test.do_catchsql_xfer_test = function(test_arg, test_name, func, exp, opts) > + do_xfer_test(test_arg, test_arg.do_catchsql_test, test_name, func, exp, opts) > end > > test:do_execsql_test( I reverted this entire diff hunk and luacheck passed. Indeed, in this hunk you only fix upvalue redefinitions, which we have agreed to leave as is, and you even added ignores to .luacheckrc to the list of global ignores: -- Redefining a local variable. "411", -- Redefining an argument. "412", -- Shadowing a local variable. "421", -- Shadowing an upvalue. "431", -- Shadowing an upvalue argument. "432", Why did you change this file? Also I did this and the check also has passed: diff --git a/test/sql-tap/analyze9.test.lua b/test/sql-tap/analyze9.test.lua index 50300cdbe..b8955531a 100755 --- a/test/sql-tap/analyze9.test.lua +++ b/test/sql-tap/analyze9.test.lua @@ -244,7 +244,7 @@ test:do_execsql_test( local function insert_filler_rows_n(iStart, nCopy, nVal) for i = 0, nVal-1 do local iVal = iStart+i - for _ = 0, nCopy-1 do + for j = 0, nCopy-1 do box.execute(string.format("INSERT INTO t1 VALUES (null, %s, %s, '%s')", iVal, iVal, iVal)) end end I reverted one of your first changes in this commit. The check passes because it looks like you left a ton of ignores in files["test/sql-tap/**/*.lua"] in .luacheckrc. These comments make me think that you checked the files without using .luacheckrc config or I don't know. I suggest you to re-make the patch with these ignores and excess diff removed.