diff options
| author | OpportunityLiu <[email protected]> | 2019-06-09 11:46:22 +0800 |
|---|---|---|
| committer | OpportunityLiu <[email protected]> | 2019-06-09 11:46:22 +0800 |
| commit | 8049d92b3e9aef35e4f124e5ae361bdd1f5c5435 (patch) | |
| tree | f6a0a74de240153123268fd483e3cdd3d0ee0050 | |
| parent | db9c880b656e33b056bd3e3804eb6009ea946fea (diff) | |
fix
| -rw-r--r-- | tests/runner.lua | 2 | ||||
| -rw-r--r-- | tests/test_utils/test_assert.lua | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/tests/runner.lua b/tests/runner.lua index 177bb865a..b4325edc2 100644 --- a/tests/runner.lua +++ b/tests/runner.lua @@ -59,7 +59,7 @@ function main(script) { function (error) if not error:find("aborting because of ") then - print_error(error, v, "unhandled error") + context:print_error(error, v, "unhandled error") else raise(error) end diff --git a/tests/test_utils/test_assert.lua b/tests/test_utils/test_assert.lua index f9af3c89a..42a276d87 100644 --- a/tests/test_utils/test_assert.lua +++ b/tests/test_utils/test_assert.lua @@ -45,19 +45,23 @@ function test_assert:are_not_equal(actual, expacted) end end +test_assert._will_raise_stack = {} function test_assert:will_raise(func, message_pattern) + table.insert(self._will_raise_stack, 1, debug.getinfo(2).func) try{ func, finally{ function (ok, error) + local funcs = { func, unpack(self._will_raise_stack) } if ok then - self:print_error("expected raise but finished successfully", func) + self:print_error("expected raise but finished successfully", funcs) elseif message_pattern and not string.find(error, message_pattern) then - self:print_error(format("expected raise with message ${green}%s${reset} but got ${red}%s${reset}", message_pattern, error), func) + self:print_error(format("expected raise with message ${green}%s${reset} but got ${red}%s${reset}", message_pattern, error), funcs) end end } } + table.remove(self._will_raise_stack, 1) end function main(context) |
