From 3080fa152a8bedfe31189f25550a2c6ce527e413 Mon Sep 17 00:00:00 2001
From: Sergey Bronnikov <sergeyb@tarantool.org>
Date: Fri, 29 May 2020 12:29:31 +0000
Subject: [PATCH] test: fix luacheck warnings in test/long_run-py
Closes #5460
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 | 1 -
test/long_run-py/box.lua | 2 -
test/long_run-py/lua/finalizers.lua | 10 ++-
test/long_run-py/suite.ini | 1 -
test/long_run-py/suite.lua | 111 ----------------------------
5 files changed, 6 insertions(+), 119 deletions(-)
delete mode 100644 test/long_run-py/suite.lua
diff --git a/.luacheckrc b/.luacheckrc
index 180da6569f..301b738a50 100644
--- a/.luacheckrc
+++ b/.luacheckrc
@@ -41,7 +41,6 @@ exclude_files = {
"test/box/lua/test_init.lua",
"test/engine/**/*.lua",
"test/engine_long/**/*.lua",
- "test/long_run-py/**/*.lua",
"test/luajit-tap/**/*.lua",
"test/replication/**/*.lua",
"test/replication-py/**/*.lua",
diff --git a/test/long_run-py/box.lua b/test/long_run-py/box.lua
index b4f65dcdb8..354e680b47 100644
--- a/test/long_run-py/box.lua
+++ b/test/long_run-py/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/long_run-py/lua/finalizers.lua b/test/long_run-py/lua/finalizers.lua
index 69146a3231..bdd6aa6334 100644
--- a/test/long_run-py/lua/finalizers.lua
+++ b/test/long_run-py/lua/finalizers.lua
@@ -1,19 +1,21 @@
#!/usr/bin/env tarantool
-function on_gc(t)
+local function on_gc()
end;
-function test_finalizers()
+local function test_finalizers()
local result = {}
local i = 1
local ffi = require('ffi')
- while true do
+ while i ~= 0 do
result[i] = ffi.gc(ffi.cast('void *', 0), on_gc)
i = i + 1
end
+ -- Fake-read 'result' to calm down 'luacheck' complaining that the variable
+ -- is never used.
+ assert(#result ~= 0)
return "done"
end;
test_finalizers()
test_finalizers()
-
diff --git a/test/long_run-py/suite.ini b/test/long_run-py/suite.ini
index 110bbb5489..7561fdb5a6 100644
--- a/test/long_run-py/suite.ini
+++ b/test/long_run-py/suite.ini
@@ -5,7 +5,6 @@ script = box.lua
long_run = finalizers.test.py
valgrind_disabled =
release_disabled =
-lua_libs = suite.lua
use_unix_sockets = True
use_unix_sockets_iproto = True
is_parallel = True
diff --git a/test/long_run-py/suite.lua b/test/long_run-py/suite.lua
deleted file mode 100644
index 0b33dec7d7..0000000000
--- a/test/long_run-py/suite.lua
+++ /dev/null
@@ -1,111 +0,0 @@
-
-function string_function()
- local random_number
- local random_string
- random_string = ""
- for x = 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)
- local string_value
- if (box.space._space.index.name:select{'tester'}[1] ~= nil) then
- box.space.tester:drop()
- end
- box.schema.space.create('tester', {engine=engine_name})
- box.space.tester:create_index('primary',{type = 'tree', parts = {1, 'STR'}})
-
- local random_number
- local string_value_2
- local string_value_3
- local counter = 1
- while counter < 100000 do
- local string_value = string_function()
-
- local string_table = box.space.tester.index.primary:select({string_value}, {iterator = 'GE', limit = 1})
- if string_table[1] == nil then
- box.space.tester:insert{string_value, counter}
- string_value_2 = string_value
- else
- string_value_2 = string_table[1][1]
- end
-
- if string_value_2 == nil then
- box.space.tester:insert{string_value, counter}
- string_value_2 = string_value
- end
-
- 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
- if random_number == 2 then
- box.space.tester:replace{string_value_2, counter, string_value_3}
- end
- if random_number == 3 then
- box.space.tester:delete{string_value_2}
- box.space.tester:insert{string_value_2, counter}
- end
- if random_number == 4 then
- if counter < 1000000 then
- box.space.tester:delete{string_value_3}
- box.space.tester:insert{string_value_3, counter, string_value_2}
- end
- end
- if random_number == 5 then
- box.space.tester:update({string_value_2}, {{'=', 2, string_value_3}})
- end
- if random_number == 6 then
- box.space.tester:update({string_value_2}, {{'=', 2, string_value_3}})
- end
- counter = counter + 1
- end
-
- box.space.tester:drop()
- return {counter, random_number, string_value_2, string_value_3}
-end
-
-function delete_insert(engine_name)
- local string_value
- if (box.space._space.index.name:select{'tester'}[1] ~= nil) then
- box.space.tester:drop()
- end
- box.schema.space.create('tester', {engine=engine_name})
- box.space.tester:create_index('primary',{type = 'tree', parts = {1, 'STR'}})
- local string_value_2
- local counter = 1
- while counter < 100000 do
- local string_value = string_function()
- local string_table = box.space.tester.index.primary:select({string_value}, {iterator = 'GE', limit = 1})
-
- if string_table[1] == nil then
- -- print (1, ' insert', counter, string_value)
- box.space.tester:insert{string_value, counter}
- string_value_2 = string_value
- else
- string_value_2 = string_table[1][1]
- end
-
- if string_value_2 == nil then
- -- print (2, ' insert', counter, string_value)
- box.space.tester:insert{string_value, counter}
- string_value_2 = string_value
- end
-
- -- print (3, ' delete', counter, string_value_2)
- box.space.tester:delete{string_value_2}
-
- -- print (4, ' insert', counter, string_value_2)
- box.space.tester:insert{string_value_2, counter}
-
- counter = counter + 1
- end
- box.space.tester:drop()
- return {counter, string_value_2}
-end
--
GitLab