[Tarantool-patches] [PATCH v2 09/10] test: update lua-Harness to b7b1a9a2

Igor Munkin imun at tarantool.org
Mon Jul 26 23:04:01 MSK 2021


Max,

Thanks for the fixes, LGTM!

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:
>     - 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
> =============================================================
>  

<snipped>

>  

-- 
Best regards,
IM


More information about the Tarantool-patches mailing list