diff --git a/.luacheckrc b/.luacheckrc index a5b6bf833fbafd4464c52b186ca2efed5750d0de..c01ed7437e8f2c1ba1310594a316fc4d09a91813 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 28a1560d538311fca9859021c64b12ff5a4d35be..94ae81301711bbf39a09cad27b53712c2b9b4c6d 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 b1d5042719dafc301adb10d87777bb8800304b94..06085ca782a618daf236dea391e090e66e2588d8 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 275aaa23e8df5028eeb3e508b0a947e367ec8488..b2c4ec308caa7abaf2bf40db31f9f2030be9603e 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 66cb9c82c40d9f1ab57afa7bd79847bdaf467d42..b12e00688160bc6003717424d9a4169bb5ecdc7c 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 466b8f0077e465140010ca9a127f096c4c032c38..e6906a94b694a17db34ce32c51ce6bfad4b38076 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 9ac2bff9f4fa807295c8e70006b2024ca6b5eb9e..a096e055bc2dc417b4865292649b993ca04fd5a4 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 +}