[Tarantool-patches] [PATCH v2 0/2] test: rename test files and cleanup it

[Tarantool-patches] [PATCH v2 0/2] test: rename test files and cleanup it

[Alexander V. Tikhonov]

test: rename test files and cleanup it

Cleaned up the tests code:
- added local definitions for the variables
- added os.exit() routine at the tests finish
- changed added information messages to test:ok() calls

Renamed test files in the following way:
<repo>-<number>-<comment>.test.lua
where "external repo" is github repository:
  gh - tarantool/tarantool
  lj - luajit/luajit
  or - openresty/lua-resty-core

Close #4655

Changed V2:
- renamed tests as suggested
- added tap.test names

0/2 https://lists.tarantool.org/pipermail/tarantool-patches/2019-December/013087.html
1/2 https://lists.tarantool.org/pipermail/tarantool-patches/2019-December/013086.html
2/2 https://lists.tarantool.org/pipermail/tarantool-patches/2019-December/013085.html

Github: https://github.com/tarantool/LuaJIT/tree/avtikhon/gh-4655-cleanup-tests
Issue: https://github.com/tarantool/tarantool/issues/4655

Alexander V. Tikhonov (2):
  test: cleanup tests code
  test: rename test files

 ... gh-3196-incorrect-string-length.test.lua} |  8 +++----
 ...h-4476-fix-string-find-recording.test.lua} |  6 ++---
 ...st.lua => gh-4560-pairsmm-is-set.test.lua} |  8 ++++---
 ...lj-494-table-chain-infinite-loop.test.lua} | 23 ++++++++++---------
 ...=> lj-505-fold-icorrect-behavior.test.lua} |  7 +++---
 ...est.lua => or-232-unsink-64-kptr.test.lua} |  7 +++---
 ...=> or-524-fold-icorrect-behavior.test.lua} |  4 ++--
 7 files changed, 34 insertions(+), 29 deletions(-)
 rename test/{gh.test.lua => gh-3196-incorrect-string-length.test.lua} (56%)
 rename test/{fix_string_find_recording.test.lua => gh-4476-fix-string-find-recording.test.lua} (95%)
 rename test/{pairsmm_tarantool_4560.test.lua => gh-4560-pairsmm-is-set.test.lua} (89%)
 rename test/{table_chain_bug_LuaJIT_494.test.lua => lj-494-table-chain-infinite-loop.test.lua} (89%)
 rename test/{fold_bug_LuaJIT_505.test.lua => lj-505-fold-icorrect-behavior.test.lua} (72%)
 rename test/{unsink_64_kptr.test.lua => or-232-unsink-64-kptr.test.lua} (87%)
 rename test/{fold_bug_LuaJIT_524.test.lua => or-524-fold-icorrect-behavior.test.lua} (85%)

-- 
2.17.1

[Tarantool-patches] [PATCH v2 1/2] test: cleanup tests code

[Alexander V. Tikhonov]

Cleaned up the tests code:
- added local definitions for the variables
- added os.exit() routine at the tests finish
- changed added information messages to test:ok() calls

Part of #4655
---
 test/fix_string_find_recording.test.lua  |  6 +++---
 test/fold_bug_LuaJIT_505.test.lua        |  7 ++++---
 test/fold_bug_LuaJIT_524.test.lua        |  4 ++--
 test/gh.test.lua                         |  8 ++++----
 test/pairsmm_tarantool_4560.test.lua     |  8 +++++---
 test/table_chain_bug_LuaJIT_494.test.lua | 23 ++++++++++++-----------
 test/unsink_64_kptr.test.lua             |  7 ++++---
 7 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/test/fix_string_find_recording.test.lua b/test/fix_string_find_recording.test.lua
index d3fc9e1..209090a 100755
--- a/test/fix_string_find_recording.test.lua
+++ b/test/fix_string_find_recording.test.lua
@@ -1,8 +1,8 @@
 #!/usr/bin/env tarantool
 
-tap = require('tap')
+local tap = require('tap')
 
-test = tap.test("fix-string-find-recording")
+local test = tap.test("gh-4476-fix-string-find-recording")
 test:plan(1)
 
 local err = [[module 'kit.1.10.3-136' not found:
@@ -76,4 +76,4 @@ until not e
 
 test:is(count_vm, count_jit)
 
-test:check()
+os.exit(test:check() and 0 or 1)
diff --git a/test/fold_bug_LuaJIT_505.test.lua b/test/fold_bug_LuaJIT_505.test.lua
index 2fee069..3b7d7df 100755
--- a/test/fold_bug_LuaJIT_505.test.lua
+++ b/test/fold_bug_LuaJIT_505.test.lua
@@ -1,8 +1,8 @@
 #!/usr/bin/env tarantool
 
-tap = require('tap')
+local tap = require('tap')
 
-test = tap.test("505")
+local test = tap.test("lj-505-fold-icorrect-behavior")
 test:plan(1)
 
 -- Test file to demonstrate Lua fold machinery icorrect behavior, details:
@@ -16,5 +16,6 @@ for _ = 1, 20 do
     local pos_b = string.find(value2, "b", 2, true)
     assert(pos_b == 2, "FAIL: position of 'b' is " .. pos_b)
 end
+test:ok(true, "LuaJIT/LuaJIT gh-505 assert not occured")
 
-test:ok("PASS")
+os.exit(test:check() and 0 or 1)
diff --git a/test/fold_bug_LuaJIT_524.test.lua b/test/fold_bug_LuaJIT_524.test.lua
index b056684..a232eea 100755
--- a/test/fold_bug_LuaJIT_524.test.lua
+++ b/test/fold_bug_LuaJIT_524.test.lua
@@ -3,7 +3,7 @@
 local tap = require('tap')
 local ffi = require('ffi')
 
-local test = tap.test("LuaJIT 524")
+local test = tap.test("or-524-fold-icorrect-behavior")
 test:plan(1)
 
 -- Test file to demonstrate LuaJIT folding machinery incorrect behaviour,
@@ -21,4 +21,4 @@ end
 
 test:is(tonumber(sq), math.fmod(math.pow(42, 8), math.pow(2, 32)))
 
-test:check()
+os.exit(test:check() and 0 or 1)
diff --git a/test/gh.test.lua b/test/gh.test.lua
index 00b71a6..f135de7 100755
--- a/test/gh.test.lua
+++ b/test/gh.test.lua
@@ -1,17 +1,17 @@
 #!/usr/bin/env tarantool
 
 -- Miscellaneous test for LuaJIT bugs
-tap = require('tap')
+local tap = require('tap')
 
-test = tap.test("gh")
+local test = tap.test("gh-3196-incorrect-string-length")
 test:plan(2)
 --
 -- gh-3196: incorrect string length if Lua hash returns 0
 --
-h = "\x1F\x93\xE2\x1C\xCA\xDE\x28\x08\x26\x01\xED\x0A\x2F\xE4\x21\x02\x97\x77\xD9\x3E"
+local h = "\x1F\x93\xE2\x1C\xCA\xDE\x28\x08\x26\x01\xED\x0A\x2F\xE4\x21\x02\x97\x77\xD9\x3E"
 test:is(h:len(), 20)
 
 h = "\x0F\x93\xE2\x1C\xCA\xDE\x28\x08\x26\x01\xED\x0A\x2F\xE4\x21\x02\x97\x77\xD9\x3E"
 test:is(h:len(), 20)
 
-test:check()
+os.exit(test:check() and 0 or 1)
diff --git a/test/pairsmm_tarantool_4560.test.lua b/test/pairsmm_tarantool_4560.test.lua
index bb9835d..f4ec919 100755
--- a/test/pairsmm_tarantool_4560.test.lua
+++ b/test/pairsmm_tarantool_4560.test.lua
@@ -1,8 +1,8 @@
 #!/usr/bin/env tarantool
 
-tap = require('tap')
+local tap = require('tap')
 
-test = tap.test("PAIRSMM-is-set")
+local test = tap.test("gh-4560-PAIRSMM-is-set")
 test:plan(2)
 
 -- There is no Lua way to detect whether LJ_PAIRSMM is enabled. However, in
@@ -46,5 +46,7 @@ for k, v in ipairs(t) do
     ipairs_res = v + ipairs_res
 end
 test:is(pairs_res + ipairs_res, 0)
-os_exec_res = os.execute()
+local os_exec_res = os.execute()
 test:is(os_exec_res, 1)
+
+os.exit(test:check() and 0 or 1)
diff --git a/test/table_chain_bug_LuaJIT_494.test.lua b/test/table_chain_bug_LuaJIT_494.test.lua
index 06c0f0d..3007360 100755
--- a/test/table_chain_bug_LuaJIT_494.test.lua
+++ b/test/table_chain_bug_LuaJIT_494.test.lua
@@ -1,8 +1,8 @@
 #!/usr/bin/env tarantool
 
-tap = require('tap')
+local tap = require('tap')
 
-test = tap.test("494")
+local test = tap.test("lj-494-table-chain-infinite-loop")
 test:plan(1)
 
 -- Test file to demonstrate Lua table hash chain bugs discussed in
@@ -11,19 +11,19 @@ test:plan(1)
 --     https://gist.github.com/corsix/1fc9b13a2dd5f3659417b62dd54d4500
 
 --- Plumbing
-ffi = require"ffi"
-ffi.cdef"char* strstr(const char*, const char*)"
-strstr = ffi.C.strstr
-cast = ffi.cast
-str_hash_offset = cast("uint32_t*", strstr("*", ""))[-2] == 1 and 3 or 2
+local ffi = require("ffi")
+ffi.cdef("char* strstr(const char*, const char*)")
+local strstr = ffi.C.strstr
+local cast = ffi.cast
+local str_hash_offset = cast("uint32_t*", strstr("*", ""))[-2] == 1 and 3 or 2
 function str_hash(s)
     return cast("uint32_t*", strstr(s, "")) - str_hash_offset
 end
-table_new = require"table.new"
+local table_new = require("table.new")
 
 --- Prepare some objects
-victims = {}
-orig_hash = {}
+local victims = {}
+local orig_hash = {}
 for c in ("abcdef"):gmatch"." do
     v = c .. "{09add58a-13a4-44e0-a52c-d44d0f9b2b95}"
     victims[c] = v
@@ -174,5 +174,6 @@ collectgarbage()
 for c, v in pairs(victims) do
     str_hash(v)[0] = orig_hash[c]
 end
+test:ok(true, "LuaJIT/LuaJIT gh-494 successfully checked commit a7dc9e8d23315217c9fe0029bc8ae12c03306b33")
 
-test:ok("PASS")
+os.exit(test:check() and 0 or 1)
diff --git a/test/unsink_64_kptr.test.lua b/test/unsink_64_kptr.test.lua
index 8995763..a618fd2 100755
--- a/test/unsink_64_kptr.test.lua
+++ b/test/unsink_64_kptr.test.lua
@@ -1,8 +1,8 @@
 #!/usr/bin/env tarantool
 
-tap = require('tap')
+local tap = require('tap')
 
-test = tap.test("232")
+local test = tap.test("or-232-unsink-64-kptr")
 test:plan(1)
 
 --- From: Thibault Charbonnier <thibaultcha@me.com>
@@ -40,5 +40,6 @@ end
 for i = 1, 1000 do
     fn(i)
 end
+test:ok(true, "openresty-lua/resty-core gh-232 allowed its address to be inlined")
 
-test:ok("PASS")
+os.exit(test:check() and 0 or 1)
-- 
2.17.1

[Tarantool-patches] [PATCH v2 2/2] test: rename test files

[Alexander V. Tikhonov]

Renamed test files in the following way:
<repo>-<number>-<comment>.test.lua
where "external repo" is github repository:
  gh - tarantool/tarantool
  lj - luajit/luajit
  or - openresty/lua-resty-core

Close #4655
---
 test/{gh.test.lua => gh-3196-incorrect-string-length.test.lua}    | 0
 ...ording.test.lua => gh-4476-fix-string-find-recording.test.lua} | 0
 ...mm_tarantool_4560.test.lua => gh-4560-pairsmm-is-set.test.lua} | 0
 ...JIT_494.test.lua => lj-494-table-chain-infinite-loop.test.lua} | 0
 ...LuaJIT_505.test.lua => lj-505-fold-icorrect-behavior.test.lua} | 0
 test/{unsink_64_kptr.test.lua => or-232-unsink-64-kptr.test.lua}  | 0
 ...LuaJIT_524.test.lua => or-524-fold-icorrect-behavior.test.lua} | 0
 7 files changed, 0 insertions(+), 0 deletions(-)
 rename test/{gh.test.lua => gh-3196-incorrect-string-length.test.lua} (100%)
 rename test/{fix_string_find_recording.test.lua => gh-4476-fix-string-find-recording.test.lua} (100%)
 rename test/{pairsmm_tarantool_4560.test.lua => gh-4560-pairsmm-is-set.test.lua} (100%)
 rename test/{table_chain_bug_LuaJIT_494.test.lua => lj-494-table-chain-infinite-loop.test.lua} (100%)
 rename test/{fold_bug_LuaJIT_505.test.lua => lj-505-fold-icorrect-behavior.test.lua} (100%)
 rename test/{unsink_64_kptr.test.lua => or-232-unsink-64-kptr.test.lua} (100%)
 rename test/{fold_bug_LuaJIT_524.test.lua => or-524-fold-icorrect-behavior.test.lua} (100%)

diff --git a/test/gh.test.lua b/test/gh-3196-incorrect-string-length.test.lua
similarity index 100%
rename from test/gh.test.lua
rename to test/gh-3196-incorrect-string-length.test.lua
diff --git a/test/fix_string_find_recording.test.lua b/test/gh-4476-fix-string-find-recording.test.lua
similarity index 100%
rename from test/fix_string_find_recording.test.lua
rename to test/gh-4476-fix-string-find-recording.test.lua
diff --git a/test/pairsmm_tarantool_4560.test.lua b/test/gh-4560-pairsmm-is-set.test.lua
similarity index 100%
rename from test/pairsmm_tarantool_4560.test.lua
rename to test/gh-4560-pairsmm-is-set.test.lua
diff --git a/test/table_chain_bug_LuaJIT_494.test.lua b/test/lj-494-table-chain-infinite-loop.test.lua
similarity index 100%
rename from test/table_chain_bug_LuaJIT_494.test.lua
rename to test/lj-494-table-chain-infinite-loop.test.lua
diff --git a/test/fold_bug_LuaJIT_505.test.lua b/test/lj-505-fold-icorrect-behavior.test.lua
similarity index 100%
rename from test/fold_bug_LuaJIT_505.test.lua
rename to test/lj-505-fold-icorrect-behavior.test.lua
diff --git a/test/unsink_64_kptr.test.lua b/test/or-232-unsink-64-kptr.test.lua
similarity index 100%
rename from test/unsink_64_kptr.test.lua
rename to test/or-232-unsink-64-kptr.test.lua
diff --git a/test/fold_bug_LuaJIT_524.test.lua b/test/or-524-fold-icorrect-behavior.test.lua
similarity index 100%
rename from test/fold_bug_LuaJIT_524.test.lua
rename to test/or-524-fold-icorrect-behavior.test.lua
-- 
2.17.1

Re: [Tarantool-patches] [PATCH v2 1/2] test: cleanup tests code

[Igor Munkin]

Sasha,

Thanks for the patch. I left some comments below, please consider them.

On 27.02.20, Alexander V. Tikhonov wrote:
> Cleaned up the tests code:
> - added local definitions for the variables
> - added os.exit() routine at the tests finish
> - changed added information messages to test:ok() calls

I propose to reword the commit message the following way:
| test: cleanup tests code
|
| Cleaned up the tests code according to the Lua style guide:
| - made scoped variables local
| - added os.exit call at the end of the test chunk
| - adjusted the messages in test:ok calls

General comment: please adjust the test names regarding the changes I
proposed in the second patch.

> 
> Part of #4655
> ---
>  test/fix_string_find_recording.test.lua  |  6 +++---
>  test/fold_bug_LuaJIT_505.test.lua        |  7 ++++---
>  test/fold_bug_LuaJIT_524.test.lua        |  4 ++--
>  test/gh.test.lua                         |  8 ++++----
>  test/pairsmm_tarantool_4560.test.lua     |  8 +++++---
>  test/table_chain_bug_LuaJIT_494.test.lua | 23 ++++++++++++-----------
>  test/unsink_64_kptr.test.lua             |  7 ++++---
>  7 files changed, 34 insertions(+), 29 deletions(-)
> 

<snipped>

> diff --git a/test/fold_bug_LuaJIT_505.test.lua b/test/fold_bug_LuaJIT_505.test.lua
> index 2fee069..3b7d7df 100755
> --- a/test/fold_bug_LuaJIT_505.test.lua
> +++ b/test/fold_bug_LuaJIT_505.test.lua
> @@ -1,8 +1,8 @@
>  #!/usr/bin/env tarantool
>  
> -tap = require('tap')
> +local tap = require('tap')
>  
> -test = tap.test("505")
> +local test = tap.test("lj-505-fold-icorrect-behavior")
>  test:plan(1)
>  
>  -- Test file to demonstrate Lua fold machinery icorrect behavior, details:
> @@ -16,5 +16,6 @@ for _ = 1, 20 do
>      local pos_b = string.find(value2, "b", 2, true)
>      assert(pos_b == 2, "FAIL: position of 'b' is " .. pos_b)
>  end
> +test:ok(true, "LuaJIT/LuaJIT gh-505 assert not occured")

Message is absolutely non-informative. I propose to reword it:
| "string.find offset aritmetics wasn't broken while recording"

>  
> -test:ok("PASS")
> +os.exit(test:check() and 0 or 1)

<snipped>

> diff --git a/test/table_chain_bug_LuaJIT_494.test.lua b/test/table_chain_bug_LuaJIT_494.test.lua
> index 06c0f0d..3007360 100755
> --- a/test/table_chain_bug_LuaJIT_494.test.lua
> +++ b/test/table_chain_bug_LuaJIT_494.test.lua
> @@ -1,8 +1,8 @@
>  #!/usr/bin/env tarantool
>  
> -tap = require('tap')
> +local tap = require('tap')
>  
> -test = tap.test("494")
> +local test = tap.test("lj-494-table-chain-infinite-loop")
>  test:plan(1)
>  
>  -- Test file to demonstrate Lua table hash chain bugs discussed in
> @@ -11,19 +11,19 @@ test:plan(1)
>  --     https://gist.github.com/corsix/1fc9b13a2dd5f3659417b62dd54d4500
>  
>  --- Plumbing
> -ffi = require"ffi"
> -ffi.cdef"char* strstr(const char*, const char*)"
> -strstr = ffi.C.strstr
> -cast = ffi.cast
> -str_hash_offset = cast("uint32_t*", strstr("*", ""))[-2] == 1 and 3 or 2
> +local ffi = require("ffi")
> +ffi.cdef("char* strstr(const char*, const char*)")
> +local strstr = ffi.C.strstr
> +local cast = ffi.cast
> +local str_hash_offset = cast("uint32_t*", strstr("*", ""))[-2] == 1 and 3 or 2
>  function str_hash(s)
>      return cast("uint32_t*", strstr(s, "")) - str_hash_offset
>  end
> -table_new = require"table.new"
> +local table_new = require("table.new")
>  
>  --- Prepare some objects
> -victims = {}
> -orig_hash = {}
> +local victims = {}
> +local orig_hash = {}
>  for c in ("abcdef"):gmatch"." do
>      v = c .. "{09add58a-13a4-44e0-a52c-d44d0f9b2b95}"
>      victims[c] = v
> @@ -174,5 +174,6 @@ collectgarbage()
>  for c, v in pairs(victims) do
>      str_hash(v)[0] = orig_hash[c]
>  end
> +test:ok(true, "LuaJIT/LuaJIT gh-494 successfully checked commit a7dc9e8d23315217c9fe0029bc8ae12c03306b33")

Message is absolutely non-informative. I propose to reword it:
| "table keys collisions are resolved properly (no assertions failed)"

>  
> -test:ok("PASS")
> +os.exit(test:check() and 0 or 1)
> diff --git a/test/unsink_64_kptr.test.lua b/test/unsink_64_kptr.test.lua
> index 8995763..a618fd2 100755
> --- a/test/unsink_64_kptr.test.lua
> +++ b/test/unsink_64_kptr.test.lua
> @@ -1,8 +1,8 @@
>  #!/usr/bin/env tarantool
>  
> -tap = require('tap')
> +local tap = require('tap')
>  
> -test = tap.test("232")
> +local test = tap.test("or-232-unsink-64-kptr")
>  test:plan(1)
>  
>  --- From: Thibault Charbonnier <thibaultcha@me.com>
> @@ -40,5 +40,6 @@ end
>  for i = 1, 1000 do
>      fn(i)
>  end
> +test:ok(true, "openresty-lua/resty-core gh-232 allowed its address to be inlined")

Here is a mess with a message, it totally doesn't describe the check
being made. I propose the following comment:
| "allocation is unsunk at the trace exit (no platform failures)"

>  
> -test:ok("PASS")
> +os.exit(test:check() and 0 or 1)
> -- 
> 2.17.1
> 

-- 
Best regards,
IM

Re: [Tarantool-patches] [PATCH v2 2/2] test: rename test files

[Igor Munkin]

Sasha,

Thanks for the patch. I left some comments below, please consider them.

On 27.02.20, Alexander V. Tikhonov wrote:
> Renamed test files in the following way:
> <repo>-<number>-<comment>.test.lua
> where "external repo" is github repository:

Typo: s/external repo/<repo>/.

>   gh - tarantool/tarantool
>   lj - luajit/luajit

Typo: s/luajit/LuaJIT/g.

>   or - openresty/lua-resty-core

Typo: s/lua-resty-core/luajit2/.

> 
> Close #4655
> ---
>  test/{gh.test.lua => gh-3196-incorrect-string-length.test.lua}    | 0
>  ...ording.test.lua => gh-4476-fix-string-find-recording.test.lua} | 0
>  ...mm_tarantool_4560.test.lua => gh-4560-pairsmm-is-set.test.lua} | 0
>  ...JIT_494.test.lua => lj-494-table-chain-infinite-loop.test.lua} | 0
>  ...LuaJIT_505.test.lua => lj-505-fold-icorrect-behavior.test.lua} | 0
>  test/{unsink_64_kptr.test.lua => or-232-unsink-64-kptr.test.lua}  | 0
>  ...LuaJIT_524.test.lua => or-524-fold-icorrect-behavior.test.lua} | 0
>  7 files changed, 0 insertions(+), 0 deletions(-)
>  rename test/{gh.test.lua => gh-3196-incorrect-string-length.test.lua} (100%)
>  rename test/{fix_string_find_recording.test.lua => gh-4476-fix-string-find-recording.test.lua} (100%)
>  rename test/{pairsmm_tarantool_4560.test.lua => gh-4560-pairsmm-is-set.test.lua} (100%)
>  rename test/{table_chain_bug_LuaJIT_494.test.lua => lj-494-table-chain-infinite-loop.test.lua} (100%)
>  rename test/{fold_bug_LuaJIT_505.test.lua => lj-505-fold-icorrect-behavior.test.lua} (100%)
>  rename test/{unsink_64_kptr.test.lua => or-232-unsink-64-kptr.test.lua} (100%)
>  rename test/{fold_bug_LuaJIT_524.test.lua => or-524-fold-icorrect-behavior.test.lua} (100%)
> 
> diff --git a/test/gh.test.lua b/test/gh-3196-incorrect-string-length.test.lua
> similarity index 100%
> rename from test/gh.test.lua
> rename to test/gh-3196-incorrect-string-length.test.lua
> diff --git a/test/fix_string_find_recording.test.lua b/test/gh-4476-fix-string-find-recording.test.lua
> similarity index 100%
> rename from test/fix_string_find_recording.test.lua
> rename to test/gh-4476-fix-string-find-recording.test.lua

I propose test/gh-4476-fix-string-find-recording.test.lua.

> diff --git a/test/pairsmm_tarantool_4560.test.lua b/test/gh-4560-pairsmm-is-set.test.lua
> similarity index 100%
> rename from test/pairsmm_tarantool_4560.test.lua
> rename to test/gh-4560-pairsmm-is-set.test.lua

Please rebase your changes on the stable branch, since this test has
been removed in a9eebfa.

> diff --git a/test/table_chain_bug_LuaJIT_494.test.lua b/test/lj-494-table-chain-infinite-loop.test.lua
> similarity index 100%
> rename from test/table_chain_bug_LuaJIT_494.test.lua
> rename to test/lj-494-table-chain-infinite-loop.test.lua
> diff --git a/test/fold_bug_LuaJIT_505.test.lua b/test/lj-505-fold-icorrect-behavior.test.lua
> similarity index 100%
> rename from test/fold_bug_LuaJIT_505.test.lua
> rename to test/lj-505-fold-icorrect-behavior.test.lua

I propose test/lj-505-fold-no-strref-for-ptrdiff.test.lua.

> diff --git a/test/unsink_64_kptr.test.lua b/test/or-232-unsink-64-kptr.test.lua
> similarity index 100%
> rename from test/unsink_64_kptr.test.lua
> rename to test/or-232-unsink-64-kptr.test.lua
> diff --git a/test/fold_bug_LuaJIT_524.test.lua b/test/or-524-fold-icorrect-behavior.test.lua
> similarity index 100%
> rename from test/fold_bug_LuaJIT_524.test.lua
> rename to test/or-524-fold-icorrect-behavior.test.lua

The original issue comes from LuaJIT/LuaJIT queue, so the prefix should
be 'lj-' instead of 'or-'. Also there is a typo: s/icorrect/incorrect/.

I propose test/lj-524-fold-conv-respect-src-irt.test.lua.

> -- 
> 2.17.1
> 

-- 
Best regards,
IM

Re: [Tarantool-patches] [PATCH v2 2/2] test: rename test files

[Igor Munkin]

Sasha,

On 28.02.20, Igor Munkin wrote:

<snipped>

> > diff --git a/test/fix_string_find_recording.test.lua b/test/gh-4476-fix-string-find-recording.test.lua
> > similarity index 100%
> > rename from test/fix_string_find_recording.test.lua
> > rename to test/gh-4476-fix-string-find-recording.test.lua
> 
> I propose test/gh-4476-fix-string-find-recording.test.lua.
> 

I guess I wanted but failed to reword it, as you can see :)

Please disregard this comment.

<snipped>

-- 
Best regards,
IM

Re: [Tarantool-patches] [PATCH v2 1/2] test: cleanup tests code

[Alexander Tikhonov]

[-- Attachment #1: Type: text/plain, Size: 5078 bytes --]


Hi Igor, thanks for your comments, I’ve used all of them in the code.

  
>Пятница, 28 февраля 2020, 21:42 +03:00 от Igor Munkin <imun@tarantool.org>:
> 
>Sasha,
>
>Thanks for the patch. I left some comments below, please consider them.
>
>On 27.02.20, Alexander V. Tikhonov wrote:
>> Cleaned up the tests code:
>> - added local definitions for the variables
>> - added os.exit() routine at the tests finish
>> - changed added information messages to test:ok() calls
>
>I propose to reword the commit message the following way:
>| test: cleanup tests code
>|
>| Cleaned up the tests code according to the Lua style guide:
>| - made scoped variables local
>| - added os.exit call at the end of the test chunk
>| - adjusted the messages in test:ok calls
>
>General comment: please adjust the test names regarding the changes I
>proposed in the second patch.
Ok.
>
>>
>> Part of #4655
>> ---
>> test/fix_string_find_recording.test.lua | 6 +++---
>> test/fold_bug_LuaJIT_505.test.lua | 7 ++++---
>> test/fold_bug_LuaJIT_524.test.lua | 4 ++--
>> test/gh.test.lua | 8 ++++----
>> test/pairsmm_tarantool_4560.test.lua | 8 +++++---
>> test/table_chain_bug_LuaJIT_494.test.lua | 23 ++++++++++++-----------
>> test/unsink_64_kptr.test.lua | 7 ++++---
>> 7 files changed, 34 insertions(+), 29 deletions(-)
>>
>
><snipped>
>
>> diff --git a/test/fold_bug_LuaJIT_505.test.lua b/test/fold_bug_LuaJIT_505.test.lua
>> index 2fee069..3b7d7df 100755
>> --- a/test/fold_bug_LuaJIT_505.test.lua
>> +++ b/test/fold_bug_LuaJIT_505.test.lua
>> @@ -1,8 +1,8 @@
>> #!/usr/bin/env tarantool
>>
>> -tap = require('tap')
>> +local tap = require('tap')
>>
>> -test = tap.test("505")
>> +local test = tap.test("lj-505-fold-icorrect-behavior")
>> test:plan(1)
>>
>> -- Test file to demonstrate Lua fold machinery icorrect behavior, details:
>> @@ -16,5 +16,6 @@ for _ = 1, 20 do
>> local pos_b = string.find(value2, "b", 2, true)
>> assert(pos_b == 2, "FAIL: position of 'b' is " .. pos_b)
>> end
>> +test:ok(true, "LuaJIT/LuaJIT gh-505 assert not occured")
>
>Message is absolutely non-informative. I propose to reword it:
>| "string.find offset aritmetics wasn't broken while recording"
Done.
>>
>> -test:ok("PASS")
>> +os.exit(test:check() and 0 or 1)
>
><snipped>
>
>> diff --git a/test/table_chain_bug_LuaJIT_494.test.lua b/test/table_chain_bug_LuaJIT_494.test.lua
>> index 06c0f0d..3007360 100755
>> --- a/test/table_chain_bug_LuaJIT_494.test.lua
>> +++ b/test/table_chain_bug_LuaJIT_494.test.lua
>> @@ -1,8 +1,8 @@
>> #!/usr/bin/env tarantool
>>
>> -tap = require('tap')
>> +local tap = require('tap')
>>
>> -test = tap.test("494")
>> +local test = tap.test("lj-494-table-chain-infinite-loop")
>> test:plan(1)
>>
>> -- Test file to demonstrate Lua table hash chain bugs discussed in
>> @@ -11,19 +11,19 @@ test:plan(1)
>> --  https://gist.github.com/corsix/1fc9b13a2dd5f3659417b62dd54d4500
>>
>> --- Plumbing
>> -ffi = require"ffi"
>> -ffi.cdef"char* strstr(const char*, const char*)"
>> -strstr = ffi.C.strstr
>> -cast = ffi.cast
>> -str_hash_offset = cast("uint32_t*", strstr("*", ""))[-2] == 1 and 3 or 2
>> +local ffi = require("ffi")
>> +ffi.cdef("char* strstr(const char*, const char*)")
>> +local strstr = ffi.C.strstr
>> +local cast = ffi.cast
>> +local str_hash_offset = cast("uint32_t*", strstr("*", ""))[-2] == 1 and 3 or 2
>> function str_hash(s)
>> return cast("uint32_t*", strstr(s, "")) - str_hash_offset
>> end
>> -table_new = require"table.new"
>> +local table_new = require("table.new")
>>
>> --- Prepare some objects
>> -victims = {}
>> -orig_hash = {}
>> +local victims = {}
>> +local orig_hash = {}
>> for c in ("abcdef"):gmatch"." do
>> v = c .. "{09add58a-13a4-44e0-a52c-d44d0f9b2b95}"
>> victims[c] = v
>> @@ -174,5 +174,6 @@ collectgarbage()
>> for c, v in pairs(victims) do
>> str_hash(v)[0] = orig_hash[c]
>> end
>> +test:ok(true, "LuaJIT/LuaJIT gh-494 successfully checked commit a7dc9e8d23315217c9fe0029bc8ae12c03306b33")
>
>Message is absolutely non-informative. I propose to reword it:
>| "table keys collisions are resolved properly (no assertions failed)"
Done.
>>
>> -test:ok("PASS")
>> +os.exit(test:check() and 0 or 1)
>> diff --git a/test/unsink_64_kptr.test.lua b/test/unsink_64_kptr.test.lua
>> index  8995763 ..a618fd2 100755
>> --- a/test/unsink_64_kptr.test.lua
>> +++ b/test/unsink_64_kptr.test.lua
>> @@ -1,8 +1,8 @@
>> #!/usr/bin/env tarantool
>>
>> -tap = require('tap')
>> +local tap = require('tap')
>>
>> -test = tap.test("232")
>> +local test = tap.test("or-232-unsink-64-kptr")
>> test:plan(1)
>>
>> --- From: Thibault Charbonnier < thibaultcha@me.com >
>> @@ -40,5 +40,6 @@ end
>> for i = 1, 1000 do
>> fn(i)
>> end
>> +test:ok(true, "openresty-lua/resty-core gh-232 allowed its address to be inlined")
>
>Here is a mess with a message, it totally doesn't describe the check
>being made. I propose the following comment:
>| "allocation is unsunk at the trace exit (no platform failures)"
Done.
>>
>> -test:ok("PASS")
>> +os.exit(test:check() and 0 or 1)
>> --
>> 2.17.1
>>
>
>--
>Best regards,
>IM 
 
 
--
Alexander Tikhonov
 

[-- Attachment #2: Type: text/html, Size: 7117 bytes --]

Re: [Tarantool-patches] [PATCH v2 2/2] test: rename test files

[Alexander Tikhonov]

[-- Attachment #1: Type: text/plain, Size: 3995 bytes --]



Igor, thanks for your review, I’ve made all the changes you suggested.
  
>Пятница, 28 февраля 2020, 21:42 +03:00 от Igor Munkin <imun@tarantool.org>:
> 
>Sasha,
>
>Thanks for the patch. I left some comments below, please consider them.
>
>On 27.02.20, Alexander V. Tikhonov wrote:
>> Renamed test files in the following way:
>> <repo>-<number>-<comment>.test.lua
>> where "external repo" is github repository:
>
>Typo: s/external repo/<repo>/.
Done.
>
>> gh - tarantool/tarantool
>> lj - luajit/luajit
>
>Typo: s/luajit/LuaJIT/g.
Done.
>> or - openresty/lua-resty-core
>
>Typo: s/lua-resty-core/luajit2/.
Done.
>>
>> Close #4655
>> ---
>> test/{gh.test.lua => gh-3196-incorrect-string-length.test.lua} | 0
>> ...ording.test.lua => gh-4476-fix-string-find-recording.test.lua} | 0
>> ...mm_tarantool_4560.test.lua => gh-4560-pairsmm-is-set.test.lua} | 0
>> ...JIT_494.test.lua => lj-494-table-chain-infinite-loop.test.lua} | 0
>> ...LuaJIT_505.test.lua => lj-505-fold-icorrect-behavior.test.lua} | 0
>> test/{unsink_64_kptr.test.lua => or-232-unsink-64-kptr.test.lua} | 0
>> ...LuaJIT_524.test.lua => or-524-fold-icorrect-behavior.test.lua} | 0
>> 7 files changed, 0 insertions(+), 0 deletions(-)
>> rename test/{gh.test.lua => gh-3196-incorrect-string-length.test.lua} (100%)
>> rename test/{fix_string_find_recording.test.lua => gh-4476-fix-string-find-recording.test.lua} (100%)
>> rename test/{pairsmm_tarantool_4560.test.lua => gh-4560-pairsmm-is-set.test.lua} (100%)
>> rename test/{table_chain_bug_LuaJIT_494.test.lua => lj-494-table-chain-infinite-loop.test.lua} (100%)
>> rename test/{fold_bug_LuaJIT_505.test.lua => lj-505-fold-icorrect-behavior.test.lua} (100%)
>> rename test/{unsink_64_kptr.test.lua => or-232-unsink-64-kptr.test.lua} (100%)
>> rename test/{fold_bug_LuaJIT_524.test.lua => or-524-fold-icorrect-behavior.test.lua} (100%)
>>
>> diff --git a/test/gh.test.lua b/test/gh-3196-incorrect-string-length.test.lua
>> similarity index 100%
>> rename from test/gh.test.lua
>> rename to test/gh-3196-incorrect-string-length.test.lua
>> diff --git a/test/fix_string_find_recording.test.lua b/test/gh-4476-fix-string-find-recording.test.lua
>> similarity index 100%
>> rename from test/fix_string_find_recording.test.lua
>> rename to test/gh-4476-fix-string-find-recording.test.lua
>
>I propose test/gh-4476-fix-string-find-recording.test.lua.
Seems the same.
>> diff --git a/test/pairsmm_tarantool_4560.test.lua b/test/gh-4560-pairsmm-is-set.test.lua
>> similarity index 100%
>> rename from test/pairsmm_tarantool_4560.test.lua
>> rename to test/gh-4560-pairsmm-is-set.test.lua
>
>Please rebase your changes on the stable branch, since this test has
>been removed in a9eebfa.
Done - test removed.
>> diff --git a/test/table_chain_bug_LuaJIT_494.test.lua b/test/lj-494-table-chain-infinite-loop.test.lua
>> similarity index 100%
>> rename from test/table_chain_bug_LuaJIT_494.test.lua
>> rename to test/lj-494-table-chain-infinite-loop.test.lua
>> diff --git a/test/fold_bug_LuaJIT_505.test.lua b/test/lj-505-fold-icorrect-behavior.test.lua
>> similarity index 100%
>> rename from test/fold_bug_LuaJIT_505.test.lua
>> rename to test/lj-505-fold-icorrect-behavior.test.lua
>
>I propose test/lj-505-fold-no-strref-for-ptrdiff.test.lua.
Done.
>> diff --git a/test/unsink_64_kptr.test.lua b/test/or-232-unsink-64-kptr.test.lua
>> similarity index 100%
>> rename from test/unsink_64_kptr.test.lua
>> rename to test/or-232-unsink-64-kptr.test.lua
>> diff --git a/test/fold_bug_LuaJIT_524.test.lua b/test/or-524-fold-icorrect-behavior.test.lua
>> similarity index 100%
>> rename from test/fold_bug_LuaJIT_524.test.lua
>> rename to test/or-524-fold-icorrect-behavior.test.lua
>
>The original issue comes from LuaJIT/LuaJIT queue, so the prefix should
>be 'lj-' instead of 'or-'. Also there is a typo: s/icorrect/incorrect/.
>
>I propose test/lj-524-fold-conv-respect-src-irt.test.lua.
Done.
>> --
>> 2.17.1
>>
>
>--
>Best regards,
>IM 
 
 
--
Alexander Tikhonov
 

[-- Attachment #2: Type: text/html, Size: 6170 bytes --]