From 328db384d2944fd20404fa8e5090dad4d05cc7d8 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Fri, 8 Oct 2021 16:44:56 +0000 Subject: [PATCH] test.py: daemon start/stop fixes --- test/test_py_d/ts_autosign.py | 2 +- test/test_py_d/ts_ref_altcoin.py | 2 +- test/test_py_d/ts_regtest.py | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test/test_py_d/ts_autosign.py b/test/test_py_d/ts_autosign.py index 3fccc7d7..263a1f9d 100755 --- a/test/test_py_d/ts_autosign.py +++ b/test/test_py_d/ts_autosign.py @@ -287,7 +287,7 @@ class TestSuiteAutosign(TestSuiteBase): foo = do_autosign(opts,mountpoint,mn_type='bip39',short=True) ret = do_autosign(opts,mountpoint) finally: - stop_test_daemons(*network_ids) + stop_test_daemons(*[i for i in network_ids if i != 'btc']) return ret diff --git a/test/test_py_d/ts_ref_altcoin.py b/test/test_py_d/ts_ref_altcoin.py index 64bd668a..9264e9d0 100755 --- a/test/test_py_d/ts_ref_altcoin.py +++ b/test/test_py_d/ts_ref_altcoin.py @@ -110,7 +110,7 @@ class TestSuiteRefAltcoin(TestSuiteRef,TestSuiteBase): extra_desc = f'{proto.coin}{token_desc} {proto.network}') t.read() t.ok() - if proto.sign_mode == 'daemon': + if proto.sign_mode == 'daemon' and not proto.network_id == 'btc': stop_test_daemons(proto.network_id) return 'ok' diff --git a/test/test_py_d/ts_regtest.py b/test/test_py_d/ts_regtest.py index 1404b3ce..871610ef 100755 --- a/test/test_py_d/ts_regtest.py +++ b/test/test_py_d/ts_regtest.py @@ -297,6 +297,7 @@ class TestSuiteRegtest(TestSuiteBase,TestSuiteShared): end_silence() def setup(self): + stop_test_daemons(self.proto.network_id) try: shutil.rmtree(joinpath(self.tr.data_dir,'regtest')) except: pass t = self.spawn('mmgen-regtest',['-n','setup'])