From 7a72deed9f3d6e50fb3f2f5ec3a6e5b29ac47b8c Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Wed, 30 Mar 2022 15:49:44 +0000 Subject: [PATCH] daemon.py: for test suite, use separate dir trees for each network --- mmgen/daemon.py | 3 ++- test/include/common.py | 6 +++--- test/test_py_d/ts_regtest.py | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mmgen/daemon.py b/mmgen/daemon.py index 84bdf025..bb4472d3 100755 --- a/mmgen/daemon.py +++ b/mmgen/daemon.py @@ -311,6 +311,7 @@ class CoinDaemon(Daemon): daemon_id + '_daemon' )) assert network in me.networks, f'{network!r}: unsupported network for daemon {daemon_id}' + me.network_id = network_id me.network = network me.coin = coin me.coin_name = cls.coins[coin].coin_name @@ -373,7 +374,7 @@ class CoinDaemon(Daemon): def init_datadir(self): if self.test_suite: - return os.path.join('test','daemons',self.coin.lower()) + return os.path.join('test','daemons',self.network_id) else: return os.path.join(*self.datadirs[self.platform]) diff --git a/test/include/common.py b/test/include/common.py index 7416c4b7..b4e87c5e 100755 --- a/test/include/common.py +++ b/test/include/common.py @@ -210,9 +210,9 @@ def start_test_daemons(*network_ids,remove_datadir=False): if not opt.no_daemon_autostart: return test_daemons_ops(*network_ids,op='start',remove_datadir=remove_datadir) -def stop_test_daemons(*network_ids): - if not opt.no_daemon_stop: - return test_daemons_ops(*network_ids,op='stop') +def stop_test_daemons(*network_ids,force=False,remove_datadir=False): + if force or not opt.no_daemon_stop: + return test_daemons_ops(*network_ids,op='stop',remove_datadir=remove_datadir) def restart_test_daemons(*network_ids,remove_datadir=False): if not stop_test_daemons(*network_ids): diff --git a/test/test_py_d/ts_regtest.py b/test/test_py_d/ts_regtest.py index 54f42532..dd089784 100755 --- a/test/test_py_d/ts_regtest.py +++ b/test/test_py_d/ts_regtest.py @@ -314,7 +314,7 @@ class TestSuiteRegtest(TestSuiteBase,TestSuiteShared): end_silence() def setup(self): - stop_test_daemons(self.proto.network_id) + stop_test_daemons(self.proto.network_id,force=True,remove_datadir=True) try: shutil.rmtree(joinpath(self.tr.data_dir,'regtest')) except: pass t = self.spawn('mmgen-regtest',['-n','setup'])