From 0e669c3ef89b5274aa8a74d6bbccc3ecabc57905 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Mon, 25 Sep 2023 13:25:00 +0000 Subject: [PATCH] a few minor fixes --- mmgen/main_xmrwallet.py | 5 ++--- test/test_py_d/ts_regtest.py | 2 +- test/unit_tests_d/ut_testdep.py | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/mmgen/main_xmrwallet.py b/mmgen/main_xmrwallet.py index a2f33602..baa49050 100755 --- a/mmgen/main_xmrwallet.py +++ b/mmgen/main_xmrwallet.py @@ -124,9 +124,6 @@ op = cmd_args.pop(0) infile = cmd_args.pop(0) wallets = spec = None -if op.replace('-','_') not in MoneroWalletOps.ops: - die(1,f'{op!r}: unrecognized operation') - if op in ('relay','submit','resubmit'): if len(cmd_args) != 0: cfg._opts.usage() @@ -146,6 +143,8 @@ elif op in ('export-outputs','import-key-images'): if len(cmd_args) > 1: cfg._opts.usage() wallets = cmd_args.pop(0) if cmd_args else None +else: + die(1,f'{op!r}: unrecognized operation') op_cls = getattr(MoneroWalletOps,op.replace('-','_')) diff --git a/test/test_py_d/ts_regtest.py b/test/test_py_d/ts_regtest.py index 2d03a6fc..de74ed68 100755 --- a/test/test_py_d/ts_regtest.py +++ b/test/test_py_d/ts_regtest.py @@ -788,7 +788,7 @@ class TestSuiteRegtest(TestSuiteBase,TestSuiteShared): for resp in ('u','i','t','a','m','T','A','r','r','D','D','D','D','p','P','n','V'): t.expect('draw:\b',resp,regex=True) if t.pexpect_spawn: - t.expect(r'Block:.*\b394\b',regex=True) + t.expect(r'Block:.*394',regex=True) time.sleep(1) t.send('q') time.sleep(0.2) diff --git a/test/unit_tests_d/ut_testdep.py b/test/unit_tests_d/ut_testdep.py index 2dcd7f78..5eddb3bb 100755 --- a/test/unit_tests_d/ut_testdep.py +++ b/test/unit_tests_d/ut_testdep.py @@ -12,7 +12,7 @@ sec = 'deadbeef' * 8 class unit_tests: altcoin_deps = ('pycoin','monero_python','keyconv','zcash_mini','ethkey','ssh_socks_proxy') - win_skip = ('losetup','monero_python','zcash_mini') + win_skip = ('losetup','zcash_mini') def core_repo(self,name,ut): crr = os.getenv('CORE_REPO_ROOT')