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 5B5CECC313; Thu, 21 Jan 2021 15:55:50 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 5B5CECC313 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1611233750; bh=PZAiC7Di8jnQwO6lM6GrrNLx9rDUZWV3cdiQAwZXzEA=; 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=eNO1kHyGVqI5q5oaqhM/BtZb3UKKDeAP7LweNV9DQyU+NwiKz0SAq3+bHM4wMU7qC lJAHdGlLgXdW4+qMieeFZLgM5OFlDRX9ZS9h4lM2r8+qL/noF3roeBIVkguHRD428X U7DCk4AfREEpxn1AfFEh+0hEChbnaT3Qok1br+pA= Received: from smtpng1.m.smailru.net (smtpng1.m.smailru.net [94.100.181.251]) (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 7B74ACC314 for ; Thu, 21 Jan 2021 15:51:04 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 7B74ACC314 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1l2ZQV-0007wD-Dk; Thu, 21 Jan 2021 15:51:03 +0300 To: tarantool-patches@dev.tarantool.org, v.shpilevoy@tarantool.org Date: Thu, 21 Jan 2021 15:50:13 +0300 Message-Id: <5422a0f8527b55548dc40249ba6afcd87d5dd1b2.1611232655.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: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD9FAB20BF8F0759036F8D553AE972D0F0A4ECE5B46F21C4825182A05F538085040705C7D475F05E558B6830F91DF1A5149A67077D1B1B5FD50CB5452B24EC429CE X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE769DFB715367F86D3EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063740948CD406B2B5408638F802B75D45FF5571747095F342E8C7A0BC55FA0FE5FCEB69F05919F51CB4F37157D9634D4205FEA846B21E52FA2A389733CBF5DBD5E913377AFFFEAFD269176DF2183F8FC7C0A3E989B1926288338941B15DA834481FCF19DD082D7633A0EF3E4896CB9E6436389733CBF5DBD5E9D5E8D9A59859A8B6957A4DEDD2346B42CC7F00164DA146DA6F5DAA56C3B73B23C77107234E2CFBA567F23339F89546C55F5C1EE8F4F765FC6F009C1859321A3875ECD9A6C639B01BBD4B6F7A4D31EC0BC0CAF46E325F83A522CA9DD8327EE4931B544F03EFBC4D57C2546860BDEA057BC4224003CC836476C0CAF46E325F83A50BF2EBBBDD9D6B0F05F538519369F3743B503F486389A921A5CC5B56E945C8DA X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C2549B6A8B600A67ADC77CB5574A7B237F65399290E6E00419C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF6EA1BA7CA28B4A74699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34A63B03BCD35E0C0A360DAB4DFDF624CDBEE0F4D58E3CB22A1A040FB6B001C21298AA4D73D7BF9C6A1D7E09C32AA3244C54137B575FB04182BC0809FAF1F366C5259227199D06760A927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojYT//mZRaUehttpZVGpKg9Q== X-Mailru-Sender: 689FA8AB762F73936BC43F508A0638223D4E2451CA10C7536948F236DEEE8C08DD788429FD8613638ED9BB8B05EE7B3AFB559BB5D741EB96D19CD4E7312BAA970A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v8 11/14] test: fix luacheck warnings W542 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: Sergey Bronnikov via Tarantool-patches Reply-To: sergeyb@tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" From: Sergey Bronnikov W542 (An empty if branch) Part of #5464 --- .luacheckrc | 2 -- test/sql-tap/selectA.test.lua | 8 -------- test/sql-tap/selectB.test.lua | 2 ++ test/sql-tap/tkt-91e2e8ba6f.test.lua | 3 --- test/sql-tap/tkt-9a8b09f8e6.test.lua | 3 --- test/sql-tap/tkt3493.test.lua | 3 --- test/sql-tap/with1.test.lua | 1 + 7 files changed, 3 insertions(+), 19 deletions(-) diff --git a/.luacheckrc b/.luacheckrc index 53c5de34d..98e7cb9bb 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -51,8 +51,6 @@ exclude_files = { files["test/sql-tap/**/*.lua"] = { ignore = { - -- An empty if branch. - "542", -- A line consists of nothing but whitespace. "611", -- A line contains trailing whitespace. diff --git a/test/sql-tap/selectA.test.lua b/test/sql-tap/selectA.test.lua index db4d03985..af38b5007 100755 --- a/test/sql-tap/selectA.test.lua +++ b/test/sql-tap/selectA.test.lua @@ -76,9 +76,6 @@ test:do_execsql_test( }) -- MUST_WORK_TEST -if (0 > 0) - then -end test:do_execsql_test( "selectA-2.1", [[ @@ -2353,11 +2350,6 @@ test:do_execsql_test( -- At one point the following code exposed a temp register reuse problem. -- -- MUST_WORK_TEST --- TODO stored procedures are not supported by now -if (0 > 0) - then -end - -- TODO stored procedures are not supported by now --db("func", "f", "f") test:do_execsql_test( diff --git a/test/sql-tap/selectB.test.lua b/test/sql-tap/selectB.test.lua index 6c7bc805a..f1f43af76 100755 --- a/test/sql-tap/selectB.test.lua +++ b/test/sql-tap/selectB.test.lua @@ -212,6 +212,7 @@ test:do_execsql_test( for ii = 3, 6, 1 do if ii == 4 then + assert(ii == 4) -- added to pass luacheck -- TODO --X(2, "X!cmd", [=[["optimization_control","db","query-flattener","off"]]=]) elseif ii == 5 then @@ -232,6 +233,7 @@ for ii = 3, 6, 1 do }) elseif ii == 6 then + assert(ii == 6) -- added to pass luacheck --X(2, "X!cmd", [=[["optimization_control","db","query-flattener","off"]]=]) end test:do_execsql_test( diff --git a/test/sql-tap/tkt-91e2e8ba6f.test.lua b/test/sql-tap/tkt-91e2e8ba6f.test.lua index a72b8d957..dac546f10 100755 --- a/test/sql-tap/tkt-91e2e8ba6f.test.lua +++ b/test/sql-tap/tkt-91e2e8ba6f.test.lua @@ -81,9 +81,6 @@ test:do_execsql_test( }) -- MUST_WORK_TEST -if (0 > 0) - then -end test:do_execsql_test( 1.7, [[ diff --git a/test/sql-tap/tkt-9a8b09f8e6.test.lua b/test/sql-tap/tkt-9a8b09f8e6.test.lua index 3fbc1ce37..1e5246353 100755 --- a/test/sql-tap/tkt-9a8b09f8e6.test.lua +++ b/test/sql-tap/tkt-9a8b09f8e6.test.lua @@ -21,9 +21,6 @@ test:plan(47) -- ["set","testdir",[["file","dirname",["argv0"]]]] -- ["source",[["testdir"],"\/tester.tcl"]] -- MUST_WORK_TEST -if (0 > 0) - then -end test:do_execsql_test( 1.1, [[ diff --git a/test/sql-tap/tkt3493.test.lua b/test/sql-tap/tkt3493.test.lua index 78e465b00..9387c5207 100755 --- a/test/sql-tap/tkt3493.test.lua +++ b/test/sql-tap/tkt3493.test.lua @@ -255,9 +255,6 @@ test:do_execsql_test( }) -- MUST_WORK_TEST -if (0 > 0) - then -end test:do_execsql_test( "tkt3493-3.2.1", [[ diff --git a/test/sql-tap/with1.test.lua b/test/sql-tap/with1.test.lua index 89a427ecc..32e187186 100755 --- a/test/sql-tap/with1.test.lua +++ b/test/sql-tap/with1.test.lua @@ -631,6 +631,7 @@ local function limit_test(tn, iLimit, iOffset) end -- if X(0, "X!expr01", [["$iLimit < 0 "]]) then if iLimit < 0 then + assert(iLimit < 0) -- added to pass luacheck -- result = X(467, "X!cmd", [=[["lrange",["::I"],["iOffset"],"end"]]=]) -- last is 20 else -- 2.25.1