From 6cb2caea5987083e9e8c3bc1a51053ade13994e6 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Sat, 9 Mar 2024 11:33:26 +0000 Subject: [PATCH] =?UTF-8?q?main:=20don=E2=80=99t=20handle=20non-zero=20Sys?= =?UTF-8?q?temExit;=20cmdtest=20ethdev:=20minor=20cleanup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mmgen/main.py | 6 ------ test/cmdtest_py_d/ct_ethdev.py | 10 +++++----- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/mmgen/main.py b/mmgen/main.py index 67daeed8..26af081f 100755 --- a/mmgen/main.py +++ b/mmgen/main.py @@ -70,9 +70,3 @@ def launch(*, mod=None, func=None, fqmod=None, package='mmgen'): raise sys.exit(d.exit_val) - - except SystemExit as e: - if os.getenv('MMGEN_EXEC_WRAPPER') and e.code != 0: - from .color import red - sys.stdout.write(red(f'{type(e).__name__}: {e}\n')) - raise diff --git a/test/cmdtest_py_d/ct_ethdev.py b/test/cmdtest_py_d/ct_ethdev.py index 428b4358..4a08c8e1 100755 --- a/test/cmdtest_py_d/ct_ethdev.py +++ b/test/cmdtest_py_d/ct_ethdev.py @@ -566,6 +566,11 @@ class CmdTestEthdev(CmdTestBase,CmdTestShared): write_to_file( self.genesis_fn, json.dumps(genesis_data,indent=' ')+'\n' ) init_genesis(self.genesis_fn) + def daemon_version(self): + t = self.spawn('mmgen-tool', self.eth_args + ['daemon_version']) + t.expect('version') + return t + async def _wallet_upgrade(self, src_fn, expect1, expect2=None): if self.proto.coin == 'ETC': msg(f'skipping test {self.test_name!r} for ETC') @@ -585,11 +590,6 @@ class CmdTestEthdev(CmdTestBase,CmdTestShared): twctl.tw_path.rename(bak_fn) return t - def daemon_version(self): - t = self.spawn('mmgen-tool', self.eth_args + ['daemon_version']) - t.expect('version') - return t - async def wallet_upgrade1(self): return await self._wallet_upgrade('tracking-wallet-v1.json', 'accounts field', 'network field')