From 7e8f3ab7b59f158a269c6a528876c3c3cfda0795 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Wed, 11 Oct 2023 12:58:53 +0000 Subject: [PATCH] pylint (test suite) - bugfixes --- mmgen/data/version | 2 +- test/misc/tool_api_test.py | 4 ++-- test/objtest.py | 10 +++++----- test/test_py_d/ts_ethdev.py | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/mmgen/data/version b/mmgen/data/version index cc4666f4..60891d87 100644 --- a/mmgen/data/version +++ b/mmgen/data/version @@ -1 +1 @@ -14.0.dev7 +14.0.dev8 diff --git a/test/misc/tool_api_test.py b/test/misc/tool_api_test.py index 5fa779e4..41cb6f6f 100755 --- a/test/misc/tool_api_test.py +++ b/test/misc/tool_api_test.py @@ -99,11 +99,11 @@ def run_test(): test_triplet(tool,'xmr','mainnet','M',1, 'e8164dda6d42bd1e261a3406b2038dcbddadbeefdeadbeefdeadbeefdeadbe0f', - '41i7saPWA53EoHenmJVRt34dubPxsXwoWMnw8AdMyx4mTD1svf7qYzcVjxxRfteLNdYrAxWUMmiPegFW9EfoNgXx7vDMExv' ), + '41i7saPWA53EoHenmJVRt34dubPxsXwoWMnw8AdMyx4mTD1svf7qYzcVjxxRfteLNdYrAxWUMmiPegFW9EfoNgXx7vDMExv' ) test_triplet(tool,'etc','mainnet','E',1, 'deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef', - 'c96aaa54e2d44c299564da76e1cd3184a2386b8d' ), + 'c96aaa54e2d44c299564da76e1cd3184a2386b8d' ) test_triplet(tool,'zec','mainnet','Z',1, 'SKxuS56e99jpCeD9mMQ5o63zoGPakNdM9HCvt4Vt2cypvRjCdvGJ', diff --git a/test/objtest.py b/test/objtest.py index 10e46a54..2d9e690f 100755 --- a/test/objtest.py +++ b/test/objtest.py @@ -153,9 +153,12 @@ def run_test(mod,test,arg,input_data,arg1,exc_name): if cfg.verbose and issubclass(cls,MMGenObject): ret.pmsg() if hasattr(ret,'pmsg') else pmsg(ret) + except UserWarning as e: + msg(f'==> {ret!r}') + die(2,red(str(e))) except Exception as e: if input_data == 'good': - raise ValueError(f'Error on good input data: {e}') + raise ValueError(f'Error on good input data: {e}') from e if not type(e).__name__ == exc_name: msg(f'Incorrect exception: expected {exc_name} but got {type(e).__name__}') raise @@ -167,12 +170,9 @@ def run_test(mod,test,arg,input_data,arg1,exc_name): msg( yellow(f' {exc_name}:') + str(e) ) except SystemExit as e: if input_data == 'good': - raise ValueError('Error on good input data') + raise ValueError('Error on good input data') from e if cfg.verbose: msg(f'exitval: {e.code}') - except UserWarning as e: - msg(f'==> {ret!r}') - die(2,red(str(e))) def do_loop(): import importlib diff --git a/test/test_py_d/ts_ethdev.py b/test/test_py_d/ts_ethdev.py index 7cec7924..389d3bb1 100755 --- a/test/test_py_d/ts_ethdev.py +++ b/test/test_py_d/ts_ethdev.py @@ -1136,7 +1136,7 @@ class TestSuiteEthdev(TestSuiteBase,TestSuiteShared): def token_txsign(self,ext='',token=''): return self.txsign(ni=True,ext=ext,add_args=['--token='+token]) def token_txsend(self,ext='',token=''): - return self.txsend(ext=ext,add_args=['--token=mm1']) + return self.txsend(ext=ext,add_args=['--token='+token]) def token_txcreate1(self): return self.token_txcreate(args=['98831F3A:E:12,1.23456'],token='mm1')