Browse Source

test.py: daemon start/stop fixes

The MMGen Project 3 years ago
parent
commit
328db384d2
3 changed files with 3 additions and 2 deletions
  1. 1 1
      test/test_py_d/ts_autosign.py
  2. 1 1
      test/test_py_d/ts_ref_altcoin.py
  3. 1 0
      test/test_py_d/ts_regtest.py

+ 1 - 1
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
 

+ 1 - 1
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'
 

+ 1 - 0
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'])