minor test fixes, minor Windows install fix

README.md

@@ -69,8 +69,7 @@ widespread standard.
 - **[Full transaction and address tracking support][T]** for Bitcoin, [Bcash][bx],
   [Litecoin][bx], [Ethereum][E], Ethereum Classic and [ERC20 tokens][E].
 - **Monero transacting and wallet management** via the interactive
-  [`mmgen-xmrwallet`][xm] command.  Offline transaction signing is possible
-  using a blockchain shared between online and offline machines.
+  [`mmgen-xmrwallet`][xm] command.
 - **[Address generation support][ag]** for the above coins, plus [Zcash][zx]
   (t and z addresses) and [144 Bitcoin-derived altcoins][ax].
 - **Support for all Bitcoin address types** including Segwit-P2SH and Bech32.

setup.py

@@ -12,12 +12,13 @@ def build_libsecp256k1():
 
 	def fix_broken_libpython_fn():
 		from pathlib import Path
-		from_path = Path('C:/msys64/mingw64/lib/libpython3.10.dll.a')
-		to_path   = Path('C:/msys64/mingw64/lib/libpython310.dll.a')
-		if from_path.exists() and not to_path.exists():
+		path = Path(Path().resolve().anchor) / 'msys64/mingw64/lib'
+		old = path / 'libpython3.10.dll.a'
+		new = path / 'libpython310.dll.a'
+		if old.exists() and not new.exists():
 			import shutil
-			print(f'Fixing broken library filename: {from_path.name!r} -> {to_path.name!r}')
-			shutil.copy2(from_path,to_path)
+			print(f'Fixing broken library filename: {old.name!r} -> {new.name!r}')
+			shutil.copy2(old,new)
 
 	import platform
 	if platform.system() == 'Windows':

test/test-release.sh

@@ -116,7 +116,7 @@ if [ "$(uname -m)" == 'armv7l' ]; then
 	ARM32=1
 elif [ "$(uname -m)" == 'aarch64' ]; then
 	ARM64=1
-elif uname -a | grep -q 'MSYS'; then
+elif [ "$MSYSTEM" ] && uname -a | grep -qi 'msys'; then
 	MSYS2=1;
 fi
 

test/test_py_d/ts_shared.py

@@ -85,10 +85,10 @@ class TestSuiteShared(object):
 		else:
 			if have_est_fee:
 				t.send('n')
-				if self.proto.coin == 'BCH' or self.proto.base_coin == 'ETH': # TODO: pexpect race condition?
-					time.sleep(0.1)
 			if eth_fee_res:
 				t.expect('or gas price: ',interactive_fee+'\n')
+			elif have_est_fee and self.proto.base_coin != 'ETH':
+				t.expect('fee: ',interactive_fee+'\n')
 			else:
 				t.send(interactive_fee+'\n')
 			if fee_res:

test/test_py_d/ts_xmrwallet.py

@@ -155,10 +155,11 @@ class TestSuiteXMRWallet(TestSuiteBase):
 				run(a+b2)
 				omsg(f'SSH SOCKS server started, listening at localhost:{cls.socks_port}')
 
+		debug_file = os.path.join('' if external_call else cls.datadir_base,'txrelay-proxy.debug')
 		a = ['ssh','-x','-o','ExitOnForwardFailure=True','-D',f'localhost:{cls.socks_port}']
 		b0 = ['-o','PasswordAuthentication=False']
 		b1 = ['localhost','true']
-		b2 = ['-fN','-E',os.path.join(cls.datadir_base,'txrelay-proxy.debug'),'localhost']
+		b2 = ['-fN','-E', debug_file, 'localhost']
 
 		if port_in_use(cls.socks_port):
 			omsg(f'Port {cls.socks_port} already in use.  Assuming SSH SOCKS server is running')

test/unit_tests_d/ut_rpc.py

@@ -141,9 +141,8 @@ def run_test(network_ids,test_cf_auth=False,daemon_ids=None):
 
 class unit_tests:
 
-	altcoin_deps = ('ltc','bch','geth','erigon','openethereum','parity','xmrwallet')
-	win_skip = ('xmrwallet',) # FIXME - wallet doesn't open
-	arm_skip = ('openethereum','parity') # no prebuilt binaries for ARM
+	altcoin_deps = ('ltc','bch','geth','erigon','parity','xmrwallet')
+	arm_skip = ('parity',) # no prebuilt binaries for ARM
 
 	def btc(self,name,ut):
 		return run_test(['btc','btc_tn'],test_cf_auth=True)
@@ -160,9 +159,6 @@ class unit_tests:
 	def erigon(self,name,ut):
 		return run_test(['eth','eth_tn','eth_rt'],daemon_ids=['erigon'])
 
-	def openethereum(self,name,ut):
-		return run_test(['eth','eth_tn','eth_rt'],daemon_ids=['openethereum'])
-
 	def parity(self,name,ut):
 		return run_test(['etc'])