From 81c822dd9551bbc20d5ece1c2d73699f50dc0eed Mon Sep 17 00:00:00 2001
From: The MMGen Project <mmgen@tuta.io>
Date: Wed, 22 May 2024 12:04:35 +0000
Subject: [PATCH] minor testing fixes

---
 test/cmdtest_py_d/ct_automount.py | 1 +
 test/cmdtest_py_d/ct_ethdev.py    | 4 ++--
 test/cmdtest_py_d/ct_regtest.py   | 2 +-
 test/test-release.sh              | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/cmdtest_py_d/ct_automount.py b/test/cmdtest_py_d/ct_automount.py
index c08e9ffa..292c7a69 100755
--- a/test/cmdtest_py_d/ct_automount.py
+++ b/test/cmdtest_py_d/ct_automount.py
@@ -245,6 +245,7 @@ class CmdTestAutosignAutomount(CmdTestAutosignThreaded, CmdTestRegtestBDBWallet)
 				['--alice', '--autosign'],
 				exit_val = 1 if bad_tx_desc else None)
 		if bad_tx_desc:
+			time.sleep(0.5)
 			t.expect('Only sent transactions')
 			t.expect(bad_tx_desc)
 		else:
diff --git a/test/cmdtest_py_d/ct_ethdev.py b/test/cmdtest_py_d/ct_ethdev.py
index ec8f90ad..5d692fd7 100755
--- a/test/cmdtest_py_d/ct_ethdev.py
+++ b/test/cmdtest_py_d/ct_ethdev.py
@@ -984,6 +984,8 @@ class CmdTestEthdev(CmdTestBase,CmdTestShared):
 		return self.token_compile(token_data)
 
 	async def get_tx_receipt(self,txid):
+		if self.daemon.id == 'geth': # yet another Geth bug
+			await asyncio.sleep(0.5)
 		from mmgen.tx import NewTX
 		tx = await NewTX(cfg=cfg,proto=self.proto)
 		tx.rpc = await self.rpc
@@ -1079,8 +1081,6 @@ class CmdTestEthdev(CmdTestBase,CmdTestShared):
 					dfl_devkey,
 					start_gas = self.proto.coin_amt(60000,'wei'),
 					gasPrice  = self.proto.coin_amt(8,'Gwei') )
-				if self.daemon.id == 'geth': # yet another Geth bug
-					await asyncio.sleep(0.5)
 				if (await self.get_tx_receipt(txid)).status == 0:
 					die(2,'Transfer of token funds failed. Aborting')
 
diff --git a/test/cmdtest_py_d/ct_regtest.py b/test/cmdtest_py_d/ct_regtest.py
index 97f71456..e80a70c0 100755
--- a/test/cmdtest_py_d/ct_regtest.py
+++ b/test/cmdtest_py_d/ct_regtest.py
@@ -2019,7 +2019,7 @@ class CmdTestRegtest(CmdTestBase,CmdTestShared):
 			'bob',
 			'L',
 			'More than one change address requested',
-			add_args = ['B'])
+			add_args = ['B' if self.proto.cap('segwit') else 'C'])
 
 	def carol_twimport2(self):
 		u,b = (4,3) if self.proto.cap('segwit') else (3,2)
diff --git a/test/test-release.sh b/test/test-release.sh
index 29a5eb42..b4555894 100755
--- a/test/test-release.sh
+++ b/test/test-release.sh
@@ -195,7 +195,7 @@ do_reexec() {
 		eval "python3 -m build --no-isolation --sdist --config-setting=quiet $STDOUT_DEVNULL"
 		echo -e "done\n${BLUE}Unpacking sdist archive to $YELLOW$target_dir$RESET"
 		tar -C $target_dir -axf dist/*.tar.gz
-		cd $(echo $target_dir/$repo-*)
+		cd $target_dir/${repo//-/[-_]}-*
 		echo -e "${BLUE}cd -> $YELLOW$PWD$RESET"
 		if [ "$clone_dir" ]; then rm -rf $clone_dir; fi
 	fi