[Tarantool-patches] [PATCH v2 09/10] test: update lua-Harness to b7b1a9a2
Максим Корякшин
m.kokryashkin at tarantool.org
Thu Jul 29 12:27:08 MSK 2021
Hi! Thanks for the review, Sergey!
New commit message:
==============================================================
test: update lua-Harness to c4451fe
This patch backports several small commits from the lua-Harness suite:
- follow ravi 1.0-beta4[1]
- refactor with near[2]
- follow LuaJIT[3]
- fix when no debug[4]
- check if luac exists[5]
- https[6]
- more assert[7]
[1]: https://framagit.org/fperrad/lua-Harness/-/commit/9455281b
[2]: https://framagit.org/fperrad/lua-Harness/-/commit/70404580
[3]: https://framagit.org/fperrad/lua-Harness/-/commit/ac7671b6
[4]: https://framagit.org/fperrad/lua-Harness/-/commit/4db7e539
[5]: https://framagit.org/fperrad/lua-Harness/-/commit/97e9e4c1
[6]: https://framagit.org/fperrad/lua-Harness/-/commit/673c7869
[7]: https://framagit.org/fperrad/lua-Harness/-/commit/b7b1a9a2
Part of tarantool/tarantool#5970
Part of tarantool/tarantool#4473
==============================================================
>
>>Hi, Maxim!
>>
>>LGTM, except a single nitpick regarding the commit message.
>>
>>On 26.07.21, Максим Корякшин wrote:
>>>
>>> Thanks for the review, Igor!
>>> New commit message, considering your suggestions:
>>> =============================================================
>>> test: update lua-Harness to c4451fe
>>>
>>> This patch backports several small commits from lua-Harness suite:
>>
>>Typo: s/from lua-Harness suite/from the lua-Harness suite/
>>
>>> - follow ravi 1.0-beta4[1]
>>> - refactor with near[2]
>>> - follow LuaJIT[3]
>>> - fix when no debug[4]
>>> - check if luac exists[5]
>>> - https[6]
>>> - more assert[7]
>>>
>>> [1]: https://framagit.org/fperrad/lua-Harness/-/commit/9455281b
>>> [2]: https://framagit.org/fperrad/lua-Harness/-/commit/70404580
>>> [3]: https://framagit.org/fperrad/lua-Harness/-/commit/ac7671b6
>>> [4]: https://framagit.org/fperrad/lua-Harness/-/commit/4db7e539
>>> [5]: https://framagit.org/fperrad/lua-Harness/-/commit/97e9e4c1
>>> [6]: https://framagit.org/fperrad/lua-Harness/-/commit/673c7869
>>> [7]: https://framagit.org/fperrad/lua-Harness/-/commit/b7b1a9a2
>>>
>>> Part of tarantool/tarantool#5970
>>> Part of tarantool/tarantool#4473
>>>
>>> =============================================================
>>>
>>> And here is the diff, which will add missing changes:
>>> =============================================================
>>> diff --git a/test/lua-Harness-tests/301-basic.t b/test/lua-Harness-tests/301-basic.t
>>> index 4adbb55c..e4ed2c41 100755
>>> --- a/test/lua-Harness-tests/301-basic.t
>>> +++ b/test/lua-Harness-tests/301-basic.t
>>> @@ -53,13 +53,15 @@ local lua = _retrieve_progname()
>>> plan'no_plan'
>>> do -- assert
>>> - local v, msg = assert('text', "assert string")
>>> + local v, msg, extra = assert('text', "assert string", 'extra')
>>> equals(v, 'text', "function assert")
>>> equals(msg, "assert string")
>>> - v, msg = assert({}, "assert table")
>>> + equals(extra, 'extra')
>>> + v, msg, extra = assert({}, "assert table", 'extra')
>>> equals(msg, "assert table")
>>> + equals(extra, 'extra')
>>> - error_matches(function () assert(false, "ASSERTION TEST") end,
>>> + error_matches(function () assert(false, "ASSERTION TEST", 'extra') end,
>>> "^[^:]+:%d+: ASSERTION TEST",
>>> "function assert(false, msg)")
>>> @@ -73,7 +75,7 @@ do -- assert
>>> else
>>> error_matches(function () assert(false, 42) end,
>>> "^[^:]+:%d+: 42",
>>> - "function assert(false, 42)")
>>> + "function assert(false, 42) --> invalid")
>>> end
>>> if has_error53 then
>>> =============================================================
>>>
>>>
>>>
>>> >Max,
>>> >
>>> >Thanks for the patch! Please consider the comments below.
>>> >
>>> >On 20.07.21, Maxim Kokryashkin wrote:
>>> >> This patch backports several small commits from lua-Harness suite:
>>> >> - follow ravi 1.0-beta4[1]
>>> >> - refactor with near[2]
>>> >> - follow LuaJIT[3]
>>> >> - fix when no debug[4]
>>> >> - check if luac exists[5]
>>> >> - https[6]
>>> >> - more assert[7]
>>> >>
>>> >> [1]: https://framagit.org/fperrad/lua-Harness/-/commit/9455281b
>>> >> [2]: https://framagit.org/fperrad/lua-Harness/-/commit/70404580
>>> >> [3]: https://framagit.org/fperrad/lua-Harness/-/commit/ac7671b6
>>> >> [4]: https://framagit.org/fperrad/lua-Harness/-/commit/4db7e539
>>> >> [5]: https://framagit.org/fperrad/lua-Harness/-/commit/97e9e4c1
>>> >> [6]: https://framagit.org/fperrad/lua-Harness/-/commit/673c7869
>>> >> [7]: https://framagit.org/fperrad/lua-Harness/-/commit/b7b1a9a2
>>> >
>>> >The changes from the latter commit is missing.
>>> >
>>> >Furthermore, you've updated lua-Harness up to c4451fe, which is
>>> >backported in scope of "[PATCH v2 01/10] test: port lua-Harness to
>>> >Test.Assertion". Hence, the commit subject need to be updated too.
>>> >
>>> >>
>>> >> Part of #5970
>>> >> Part of #4473
>>> >
>>> >BTW, both issues are also mentioned the wrong way. The right format is
>>> >tarantool/tarantool#<issue-number> for both cases (see the previous
>>> >patches in the series for the examples).
>>> >
>>> >> ---
>>> >> test/lua-Harness-tests/200-examples.t | 2 +-
>>> >> test/lua-Harness-tests/203-lexico.t | 2 +-
>>> >> test/lua-Harness-tests/241-standalone.t | 3 +-
>>> >> test/lua-Harness-tests/242-luac.t | 4 +++
>>> >> test/lua-Harness-tests/301-basic.t | 2 +-
>>> >> test/lua-Harness-tests/304-string.t | 2 +-
>>> >> test/lua-Harness-tests/307-math.t | 44 +++++++++++------------
>>> >> test/lua-Harness-tests/310-debug.t | 2 --
>>> >> test/lua-Harness-tests/320-stdin.t | 14 +++++---
>>> >> test/lua-Harness-tests/401-bitop.t | 2 +-
>>> >> test/lua-Harness-tests/402-ffi.t | 2 +-
>>> >> test/lua-Harness-tests/403-jit.t | 2 +-
>>> >> test/lua-Harness-tests/404-ext.t | 2 +-
>>> >> test/lua-Harness-tests/411-luajit.t | 2 +-
>>> >> test/lua-Harness-tests/profile_ravi.lua | 4 +--
>>> >> test/lua-Harness-tests/test_assertion.lua | 9 +++++
>>> >> 16 files changed, 57 insertions(+), 41 deletions(-)
>>> >>
>>> >
>>> ><snipped>
>>> >
>>> >> --
>>> >> 2.32.0
>>> >>
>>> >
>>> >--
>>> >Best regards,
>>> >IM
>>>
>>
>>--
>>Best regards,
>>Sergey Kaplun
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.tarantool.org/pipermail/tarantool-patches/attachments/20210729/a51d26f6/attachment.htm>
More information about the Tarantool-patches
mailing list