From d82be72463004d9e6ce35c40df19175cf554f130 Mon Sep 17 00:00:00 2001
From: Sergey Bronnikov <sergeyb@tarantool.org>
Date: Thu, 16 Jul 2020 12:38:18 +0000
Subject: [PATCH] luacheck: fix warnings in test/engine_long
Closes #5650
Reviewed-by: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
Reviewed-by: Igor Munkin <imun@tarantool.org>
Co-authored-by: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
Co-authored-by: Igor Munkin <imun@tarantool.org>
---
.luacheckrc | 2 +-
test/engine_long/box.lua | 2 --
test/engine_long/delete_insert.result | 3 +++
test/engine_long/delete_insert.test.lua | 1 +
test/engine_long/delete_replace_update.result | 3 +++
test/engine_long/delete_replace_update.test.lua | 1 +
test/engine_long/suite.lua | 14 ++++++++------
7 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/.luacheckrc b/.luacheckrc
index a5b6bf833f..c01ed7437e 100644
--- a/.luacheckrc
+++ b/.luacheckrc
@@ -34,7 +34,7 @@ exclude_files = {
"test/app/*.test.lua",
"test/box/*.test.lua",
"test/engine/*.test.lua",
- "test/engine_long/**/*.lua",
+ "test/engine_long/*.test.lua",
"test/luajit-tap/**/*.lua",
"test/replication/**/*.lua",
"test/replication-py/**/*.lua",
diff --git a/test/engine_long/box.lua b/test/engine_long/box.lua
index 28a1560d53..94ae813017 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 b1d5042719..06085ca782 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 275aaa23e8..b2c4ec308c 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 66cb9c82c4..b12e006881 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 466b8f0077..e6906a94b6 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 9ac2bff9f4..a096e055bc 100644
--- a/test/engine_long/suite.lua
+++ b/test/engine_long/suite.lua
@@ -2,15 +2,14 @@ local function string_function()
local random_number
local random_string
random_string = ""
- for x = 1,20,1 do
+ for _ = 1,20,1 do
random_number = math.random(65, 90)
random_string = random_string .. string.char(random_number)
end
return random_string
end
-function delete_replace_update(engine_name, iterations)
- local string_value
+local function delete_replace_update(engine_name, iterations)
if (box.space._space.index.name:select{'tester'}[1] ~= nil) then
box.space.tester:drop()
end
@@ -40,7 +39,6 @@ function delete_replace_update(engine_name, iterations)
random_number = math.random(1,6)
string_value_3 = string_function()
--- print('<'..counter..'> [' .. random_number .. '] value_2: ' .. string_value_2 .. ' value_3: ' .. string_value_3)
if random_number == 1 then
box.space.tester:delete{string_value_2}
end
@@ -68,8 +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 string_value
+local function delete_insert(engine_name, iterations)
if (box.space._space.index.name:select{'tester'}[1] ~= nil) then
box.space.tester:drop()
end
@@ -108,3 +105,8 @@ function delete_insert(engine_name, iterations)
end
_G.protected_globals = {'delete_replace_update', 'delete_insert'}
+
+return {
+ delete_replace_update = delete_replace_update,
+ delete_insert = delete_insert
+}
--
GitLab