arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-01-10 07:20:56 +00:00
Code Issues Releases Wiki Activity

core/tests: fix inline variant of assertRaises

Browse Source 
otherwise code like the following would fail:

>>> self.assertRaises(AssertionError, ensure, False)

because the AssertionError raised internally by `ensure` would be
conflated with the AssertionError raised by the tested function
This commit is contained in:
matejcik 2020-03-16 16:12:51 +01:00 committed by Tomas Susanka
parent da89a17ce5
commit a9faa4d4ab
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/tests/unittest.py
View File

@ -119,11 +119,12 @@ class TestCase:
return AssertRaisesContext(exc) return AssertRaisesContext(exc)
try: try:
func(*args, **kwargs) func(*args, **kwargs)
ensure(False, "%r not raised" % exc)
except Exception as e: except Exception as e:
if isinstance(e, exc): if isinstance(e, exc):
return return
raise raise
else:
ensure(False, "%r not raised" % exc)
def assertListEqual(self, x, y, msg=''): def assertListEqual(self, x, y, msg=''):
if len(x) != len(y): if len(x) != len(y):