From 88a9729810aca2c4837ba3c92636a7071b995e96 Mon Sep 17 00:00:00 2001
From: The MMGen Project <mmgen@tuta.io>
Date: Wed, 13 Oct 2021 20:44:43 +0000
Subject: [PATCH] test suite: Windows/MSYS2 fixes

---
 test/test_py_d/ts_ethdev.py     | 1 +
 test/unit_tests_d/ut_daemon.py  | 2 ++
 test/unit_tests_d/ut_dep.py     | 6 +++---
 test/unit_tests_d/ut_rpc.py     | 1 +
 test/unit_tests_d/ut_testdep.py | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/test/test_py_d/ts_ethdev.py b/test/test_py_d/ts_ethdev.py
index a4dc296c..553e48ab 100755
--- a/test/test_py_d/ts_ethdev.py
+++ b/test/test_py_d/ts_ethdev.py
@@ -1163,4 +1163,5 @@ class TestSuiteEthdev(TestSuiteBase,TestSuiteShared):
 		if not opt.no_daemon_stop:
 			if not stop_test_daemons(self.proto.coin+'_rt'):
 				return False
+		set_vt100()
 		return 'ok'
diff --git a/test/unit_tests_d/ut_daemon.py b/test/unit_tests_d/ut_daemon.py
index 2df1a1ff..ea8b1385 100755
--- a/test/unit_tests_d/ut_daemon.py
+++ b/test/unit_tests_d/ut_daemon.py
@@ -89,6 +89,8 @@ def test_cmds(op):
 
 class unit_tests:
 
+	win_skip = ('start','status','stop')
+
 	def flags(self,name,ut):
 
 		qmsg_r('Testing flags and opts...')
diff --git a/test/unit_tests_d/ut_dep.py b/test/unit_tests_d/ut_dep.py
index cd4ad2d2..de05f4e2 100755
--- a/test/unit_tests_d/ut_dep.py
+++ b/test/unit_tests_d/ut_dep.py
@@ -10,10 +10,10 @@ from mmgen.common import *
 
 class unit_tests:
 
-	altcoin_deps = ('keccak','py_ecc')
-	win_skip = ('aiohttp',)
+	altcoin_deps = ('pysha3','py_ecc')
+	win_skip = ('aiohttp','pysha3')
 
-	def keccak(self,name,ut): # ETH,XMR
+	def pysha3(self,name,ut): # ETH,XMR
 		from sha3 import keccak_256
 		return True
 
diff --git a/test/unit_tests_d/ut_rpc.py b/test/unit_tests_d/ut_rpc.py
index 20098282..bf0048d2 100755
--- a/test/unit_tests_d/ut_rpc.py
+++ b/test/unit_tests_d/ut_rpc.py
@@ -90,6 +90,7 @@ def run_test(network_ids,test_cf_auth=False,daemon_ids=None):
 class unit_tests:
 
 	altcoin_deps = ('ltc','bch','eth','etc','xmrwallet')
+	win_skip = ('xmrwallet',) # FIXME - wallet doesn't open
 
 	def btc(self,name,ut):
 		return run_test(['btc','btc_tn'],test_cf_auth=True)
diff --git a/test/unit_tests_d/ut_testdep.py b/test/unit_tests_d/ut_testdep.py
index 047b64ae..b2d869e1 100755
--- a/test/unit_tests_d/ut_testdep.py
+++ b/test/unit_tests_d/ut_testdep.py
@@ -10,7 +10,7 @@ sec = 'deadbeef' * 8
 class unit_tests:
 
 	altcoin_deps = ('pycoin','moneropy','keyconv','zcash_mini','ethkey')
-	win_skip = ('losetup',)
+	win_skip = ('losetup','moneropy','zcash_mini')
 
 	def core_repo(self,name,ut):
 		crr = os.getenv('CORE_REPO_ROOT')