* [Tarantool-patches] [PATCH v7 1/2] test: fix luacheck warnings in test/xlog
2021-01-13 13:56 [Tarantool-patches] [PATCH v7 0/2] Fix luacheck warnings in test/xlog and test/xlog-py Sergey Bronnikov via Tarantool-patches
@ 2021-01-13 13:56 ` Sergey Bronnikov via Tarantool-patches
2021-01-13 13:56 ` [Tarantool-patches] [PATCH v7 2/2] test: fix luacheck warnings in test/xlog-py Sergey Bronnikov via Tarantool-patches
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Sergey Bronnikov via Tarantool-patches @ 2021-01-13 13:56 UTC (permalink / raw)
To: tarantool-patches, v.shpilevoy
From: Sergey Bronnikov <sergeyb@tarantool.org>
Closes #5468
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/xlog/panic.lua | 2 +-
.../upgrade/2.1.3/gh-4771-upgrade-sequence/fill.lua | 12 ++++++------
test/xlog/xlog.lua | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/.luacheckrc b/.luacheckrc
index 4b829f3dc..5468ade25 100644
--- a/.luacheckrc
+++ b/.luacheckrc
@@ -46,7 +46,7 @@ exclude_files = {
"test/var/**/*.lua",
"test/vinyl/**/*.lua",
"test/wal_off/**/*.lua",
- "test/xlog/**/*.lua",
+ "test/xlog/*.test.lua",
"test/xlog-py/**/*.lua",
"third_party/**/*.lua",
".rocks/**/*.lua",
diff --git a/test/xlog/panic.lua b/test/xlog/panic.lua
index 2d4eb8d2e..0fa855421 100644
--- a/test/xlog/panic.lua
+++ b/test/xlog/panic.lua
@@ -1,5 +1,5 @@
#!/usr/bin/env tarantool
-os = require('os')
+local os = require('os')
box.cfg{
listen = os.getenv("LISTEN"),
diff --git a/test/xlog/upgrade/2.1.3/gh-4771-upgrade-sequence/fill.lua b/test/xlog/upgrade/2.1.3/gh-4771-upgrade-sequence/fill.lua
index b159f2b67..8e9a9d13d 100644
--- a/test/xlog/upgrade/2.1.3/gh-4771-upgrade-sequence/fill.lua
+++ b/test/xlog/upgrade/2.1.3/gh-4771-upgrade-sequence/fill.lua
@@ -1,14 +1,14 @@
box.cfg{}
-s1 = box.schema.create_space('test1')
-pk = s1:create_index('pk', {sequence = true})
+local s1 = box.schema.create_space('test1')
+s1:create_index('pk', {sequence = true})
s1:replace{box.NULL}
-seq2 = box.schema.sequence.create('seq2')
-s2 = box.schema.create_space('test2')
-pk = s2:create_index('pk', {sequence = 'seq2'})
+box.schema.sequence.create('seq2')
+local s2 = box.schema.create_space('test2')
+s2:create_index('pk', {sequence = 'seq2'})
s2:replace{box.NULL}
-seq3 = box.schema.sequence.create('seq3')
+local seq3 = box.schema.sequence.create('seq3')
seq3:next()
box.snapshot()
diff --git a/test/xlog/xlog.lua b/test/xlog/xlog.lua
index 004096d2d..aaf1a0ae6 100644
--- a/test/xlog/xlog.lua
+++ b/test/xlog/xlog.lua
@@ -1,5 +1,5 @@
#!/usr/bin/env tarantool
-os = require('os')
+local os = require('os')
box.cfg{
listen = os.getenv("LISTEN"),
--
2.25.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Tarantool-patches] [PATCH v7 2/2] test: fix luacheck warnings in test/xlog-py
2021-01-13 13:56 [Tarantool-patches] [PATCH v7 0/2] Fix luacheck warnings in test/xlog and test/xlog-py Sergey Bronnikov via Tarantool-patches
2021-01-13 13:56 ` [Tarantool-patches] [PATCH v7 1/2] test: fix luacheck warnings in test/xlog Sergey Bronnikov via Tarantool-patches
@ 2021-01-13 13:56 ` Sergey Bronnikov via Tarantool-patches
2021-01-13 16:43 ` [Tarantool-patches] [PATCH v7 0/2] Fix luacheck warnings in test/xlog and test/xlog-py Vladislav Shpilevoy via Tarantool-patches
2021-01-14 11:27 ` Kirill Yukhin via Tarantool-patches
3 siblings, 0 replies; 5+ messages in thread
From: Sergey Bronnikov via Tarantool-patches @ 2021-01-13 13:56 UTC (permalink / raw)
To: tarantool-patches, v.shpilevoy
From: Sergey Bronnikov <sergeyb@tarantool.org>
Closes #5469
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/xlog-py/box.lua | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/.luacheckrc b/.luacheckrc
index 5468ade25..62371f12a 100644
--- a/.luacheckrc
+++ b/.luacheckrc
@@ -47,7 +47,6 @@ exclude_files = {
"test/vinyl/**/*.lua",
"test/wal_off/**/*.lua",
"test/xlog/*.test.lua",
- "test/xlog-py/**/*.lua",
"third_party/**/*.lua",
".rocks/**/*.lua",
".git/**/*.lua",
diff --git a/test/xlog-py/box.lua b/test/xlog-py/box.lua
index c87f7b94b..8b9e9434f 100644
--- a/test/xlog-py/box.lua
+++ b/test/xlog-py/box.lua
@@ -1,5 +1,5 @@
#!/usr/bin/env tarantool
-os = require('os')
+local os = require('os')
box.cfg{
listen = os.getenv("LISTEN"),
--
2.25.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Tarantool-patches] [PATCH v7 0/2] Fix luacheck warnings in test/xlog and test/xlog-py
2021-01-13 13:56 [Tarantool-patches] [PATCH v7 0/2] Fix luacheck warnings in test/xlog and test/xlog-py Sergey Bronnikov via Tarantool-patches
2021-01-13 13:56 ` [Tarantool-patches] [PATCH v7 1/2] test: fix luacheck warnings in test/xlog Sergey Bronnikov via Tarantool-patches
2021-01-13 13:56 ` [Tarantool-patches] [PATCH v7 2/2] test: fix luacheck warnings in test/xlog-py Sergey Bronnikov via Tarantool-patches
@ 2021-01-13 16:43 ` Vladislav Shpilevoy via Tarantool-patches
2021-01-14 11:27 ` Kirill Yukhin via Tarantool-patches
3 siblings, 0 replies; 5+ messages in thread
From: Vladislav Shpilevoy via Tarantool-patches @ 2021-01-13 16:43 UTC (permalink / raw)
To: sergeyb, tarantool-patches
Hi! Thanks for the patchset!
LGTM.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Tarantool-patches] [PATCH v7 0/2] Fix luacheck warnings in test/xlog and test/xlog-py
2021-01-13 13:56 [Tarantool-patches] [PATCH v7 0/2] Fix luacheck warnings in test/xlog and test/xlog-py Sergey Bronnikov via Tarantool-patches
` (2 preceding siblings ...)
2021-01-13 16:43 ` [Tarantool-patches] [PATCH v7 0/2] Fix luacheck warnings in test/xlog and test/xlog-py Vladislav Shpilevoy via Tarantool-patches
@ 2021-01-14 11:27 ` Kirill Yukhin via Tarantool-patches
3 siblings, 0 replies; 5+ messages in thread
From: Kirill Yukhin via Tarantool-patches @ 2021-01-14 11:27 UTC (permalink / raw)
To: sergeyb; +Cc: tarantool-patches, v.shpilevoy
Hello,
On 13 янв 16:56, Sergey Bronnikov via Tarantool-patches wrote:
> From: Sergey Bronnikov <sergeyb@tarantool.org>
>
> Changelog v7:
> - rebased to master
>
> Changelog v6:
>
> - splitted patch in test/ for patches per sub-directory
> - adjusted supressions in .luacheckrc
> - fixed formatting issues in .luacheckrc
I've checked your patchset into 2.6 2.7 and master.
--
Regards, Kirill Yukhin
^ permalink raw reply [flat|nested] 5+ messages in thread