minor testing fixes

mmgen/proto/eth/daemon.py

@@ -91,7 +91,7 @@ class parity_daemon(openethereum_daemon):
 	exec_fn = 'parity'
 
 class geth_daemon(ethereum_daemon):
-	# upgrade to 1.14.0/1.14.3 fails:
+	# upgrade to 1.14.0/1.14.6 fails:
 	#   mempool deadlock in dev mode: "transaction indexing is in progress"
 	#   https://github.com/ethereum/go-ethereum/issues/29475
 	#   offending commit (via git bisect): 0a2f33946b95989e8ce36e72a88138adceab6a23

test/cmdtest_py_d/ct_regtest.py

@@ -34,6 +34,7 @@ from ..include.common import (
 	cfg,
 	imsg,
 	omsg,
+	ok,
 	stop_test_daemons,
 	joinpath,
 	silence,
@@ -2066,12 +2067,14 @@ class CmdTestRegtest(CmdTestBase,CmdTestShared):
 			'contains no unused addresses of address type' )
 
 	def stop(self):
+		self.spawn('', msg_only=True)
 		if cfg.no_daemon_stop:
-			self.spawn('',msg_only=True)
-			msg_r('(leaving daemon running by user request)')
-			return 'ok'
+			msg_r('(leaving regtest daemon running by user request)')
+			imsg('')
 		else:
-			return self.spawn('mmgen-regtest',['stop'])
+			stop_test_daemons(self.proto.network_id, remove_datadir=True)
+		ok()
+		return 'ok'
 
 class CmdTestRegtestBDBWallet(CmdTestRegtest):
 	bdb_wallet = True