[Tarantool-patches] [PATCH v8 13/14] test: fix luacheck warnings W621 in test/sql-tap

sergeyb at tarantool.org sergeyb at tarantool.org
Thu Jan 21 15:50:17 MSK 2021


From: Sergey Bronnikov <sergeyb at tarantool.org>

W621 (Inconsistent indentation (SPACE followed by TAB))

Part of #5464
---
 .luacheckrc                    |  2 --
 test/sql-tap/analyze7.test.lua | 14 +++++++-------
 test/sql-tap/analyzeD.test.lua |  8 ++++----
 test/sql-tap/analyzeF.test.lua |  2 +-
 test/sql-tap/index1.test.lua   |  2 +-
 5 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/.luacheckrc b/.luacheckrc
index 69be93a67..a798ca6f8 100644
--- a/.luacheckrc
+++ b/.luacheckrc
@@ -53,8 +53,6 @@ files["test/sql-tap/**/*.lua"] = {
     ignore = {
         -- A line consists of nothing but whitespace.
         "611",
-        -- Inconsistent indentation (SPACE followed by TAB).
-        "621",
         -- Line is too long.
         "631"
     }
diff --git a/test/sql-tap/analyze7.test.lua b/test/sql-tap/analyze7.test.lua
index 203a0c3f9..8aa29e951 100755
--- a/test/sql-tap/analyze7.test.lua
+++ b/test/sql-tap/analyze7.test.lua
@@ -29,11 +29,11 @@ test:do_test(
 		    DROP TABLE IF EXISTS nums;
 			CREATE TABLE nums(n  INT PRIMARY KEY);
 			INSERT into nums WITH RECURSIVE cnt(x) AS (VALUES(1) UNION ALL SELECT x+1 FROM cnt WHERE x<256) SELECT x FROM cnt;
- 			INSERT INTO t1 SELECT n, n, n, n/100, n FROM nums;
- 			EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE a=123;
+                        INSERT INTO t1 SELECT n, n, n, n/100, n FROM nums;
+                        EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE a=123;
 		]])
 		end, {
-        	-- <analyze7-1.0>
+                -- <analyze7-1.0>
             0, 0, 0, "SEARCH TABLE T1 USING COVERING INDEX T1A (A=?)"
             -- </analyze7-1.0>
         })
@@ -43,7 +43,7 @@ test:do_execsql_test(
 	[[
 		EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE b=123;
 	]], {
-    	-- <analyze7-1.1>
+        -- <analyze7-1.1>
         0, 0, 0, "SEARCH TABLE T1 USING COVERING INDEX T1B (B=?)"
         -- </analyze7-1.1>
     })
@@ -68,7 +68,7 @@ test:do_test(
 		test:execsql("ANALYZE;")
 		return test:execsql("EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE a=123;")
 	end, {
-       	-- <analyze7-2.0>
+        -- <analyze7-2.0>
         0, 0, 0, "SEARCH TABLE T1 USING COVERING INDEX T1A (A=?)"
         -- </analyze7-2.0>
     })
@@ -147,9 +147,9 @@ test:do_execsql_test(
 test:do_execsql_test(
     "analyze7-3.2.2",
     [[
-    	EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE c=2;
+        EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE c=2;
     ]], {
-    	-- <analyze7-3.2.2>
+        -- <analyze7-3.2.2>
         0, 0, 0, "SEARCH TABLE T1 USING COVERING INDEX T1CD (C=?)"
         -- </analyze7-3.2.2>
     })
diff --git a/test/sql-tap/analyzeD.test.lua b/test/sql-tap/analyzeD.test.lua
index e0426b974..c6b9fa206 100755
--- a/test/sql-tap/analyzeD.test.lua
+++ b/test/sql-tap/analyzeD.test.lua
@@ -54,8 +54,8 @@ test:do_test(
 			ANALYZE;
 		]])
 	end, {
-        	-- <1.1>
-        	-- </1.1>
+                -- <1.1>
+                -- </1.1>
     })
 
 -- With full ANALYZE data, sql sees that c=150 (5 rows) is better than
@@ -122,7 +122,7 @@ test:do_test(
 	end, {
         -- <1.7>
         -- </1.7>
-   	})
+        })
 
 -- Same test as 1.4, except this time the 7 rows that match the a=? condition
 -- do not feature larger values than all rows in the stat4 table. So sql
@@ -135,7 +135,7 @@ test:do_execsql_test(
         -- <1.8>
         0, 0, 0, "SEARCH TABLE T1 USING COVERING INDEX T1_C (C=?)"
         -- </1.8>
-   	})
+        })
 
 test:do_catchsql_test(
 	"analyzeD-1.9",
diff --git a/test/sql-tap/analyzeF.test.lua b/test/sql-tap/analyzeF.test.lua
index 0b621a3ae..cbb088415 100755
--- a/test/sql-tap/analyzeF.test.lua
+++ b/test/sql-tap/analyzeF.test.lua
@@ -25,7 +25,7 @@ box.internal.sql_create_function("isqrt", "NUMBER", isqrt)
 test:do_execsql_test(
     1.0,
     [[
-    	DROP TABLE IF EXISTS t1;
+        DROP TABLE IF EXISTS t1;
         CREATE TABLE t1(id  INT PRIMARY KEY, x INTEGER, y INTEGER);
         WITH data(i) AS (SELECT 1 UNION ALL SELECT i+1 FROM data) INSERT INTO t1 SELECT i, isqrt(i), isqrt(i) FROM data LIMIT 500;
         CREATE INDEX t1y ON t1(y);
diff --git a/test/sql-tap/index1.test.lua b/test/sql-tap/index1.test.lua
index 1ac02d60c..e647c22fe 100755
--- a/test/sql-tap/index1.test.lua
+++ b/test/sql-tap/index1.test.lua
@@ -406,7 +406,7 @@ test:do_test(
 test:do_catchsql_test(
     "index-8.1",
     [[
-    	CREATE TABLE test1(a INT PRIMARY KEY);
+        CREATE TABLE test1(a INT PRIMARY KEY);
         DROP INDEX index1 ON test1
     ]], {
         -- <index-8.1>
-- 
2.25.1



More information about the Tarantool-patches mailing list