arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-24 23:38:09 +00:00
Code Issues Releases Wiki Activity

core/tests: improve test harness (fixes #1157)

Browse Source
This commit is contained in:
matejcik 2020-08-03 15:47:47 +02:00 committed by matejcik
parent efc5ccdaf0
commit c3afb93837
1 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
core/tests/unittest.py
View File

@ -1,3 +1,5 @@
import sys
from trezor.utils import ensure from trezor.utils import ensure
@ -196,6 +198,9 @@ class TestResult:
return self.errorsNum == 0 and self.failuresNum == 0 return self.errorsNum == 0 and self.failuresNum == 0
generator_type = type((lambda: (yield))())
def run_class(c, test_result): def run_class(c, test_result):
o = c() o = c()
set_up = getattr(o, "setUp", lambda: None) set_up = getattr(o, "setUp", lambda: None)
@ -205,15 +210,29 @@ def run_class(c, test_result):
if name.startswith("test"): if name.startswith("test"):
print(' ', name, end=' ...') print(' ', name, end=' ...')
m = getattr(o, name) m = getattr(o, name)
try:
try: try:
set_up() set_up()
test_result.testsRun += 1 test_result.testsRun += 1
m() retval = m()
if isinstance(retval, generator_type):
raise RuntimeError("{} must not be a generator (it is async, uses yield or await).".format(name))
elif retval is not None:
raise RuntimeError("{} should not return a result.".format(name))
finally:
tear_down() tear_down()
print(" ok") print(" ok")
except SkipTest as e: except SkipTest as e:
print(" skipped:", e.args[0]) print(" skipped:", e.args[0])
test_result.skippedNum += 1 test_result.skippedNum += 1
except AssertionError as e:
print(" failed")
sys.print_exception(e)
test_result.failuresNum += 1
except BaseException as e:
print(" errored:", e)
sys.print_exception(e)
test_result.errorsNum += 1
def main(module="__main__"): def main(module="__main__"):
@ -230,6 +249,16 @@ def main(module="__main__"):
runner = TestRunner() runner = TestRunner()
result = runner.run(suite) result = runner.run(suite)
msg = "Ran %d tests" % result.testsRun msg = "Ran %d tests" % result.testsRun
result_strs = []
if result.skippedNum > 0: if result.skippedNum > 0:
msg += " (%d skipped)" % result.skippedNum result_strs.append("{} skipped".format(result.skippedNum))
if result.failuresNum > 0:
result_strs.append("{} failed".format(result.failuresNum))
if result.errorsNum > 0:
result_strs.append("{} errored".format(result.errorsNum))
if result_strs:
msg += " (" + ", ".join(result_strs) + ")"
print(msg) print(msg)
if not result.wasSuccessful():
raise SystemExit(1)