From 31de72e1af862976f01bd3c1b33dcb9a64891b1e Mon Sep 17 00:00:00 2001
From: The MMGen Project <mmgen@tuta.io>
Date: Fri, 19 May 2023 16:16:52 +0000
Subject: [PATCH] test/unit_tests.py: add `skip_msg` helper method

---
 test/unit_tests.py              | 25 +++++++++++++++----------
 test/unit_tests_d/ut_dep.py     |  2 +-
 test/unit_tests_d/ut_testdep.py |  4 +---
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/test/unit_tests.py b/test/unit_tests.py
index 1e6b328b..9a4adcb3 100755
--- a/test/unit_tests.py
+++ b/test/unit_tests.py
@@ -79,10 +79,15 @@ if cfg.list:
 	Msg(' '.join(all_tests))
 	sys.exit(0)
 
-class UnitTestHelpers(object):
+class UnitTestHelpers:
 
-	@classmethod
-	def process_bad_data(cls,data):
+	def __init__(self,subtest_name):
+		self.subtest_name = subtest_name
+
+	def skip_msg(self,desc):
+		cfg._util.qmsg(gray(f'Skipping subtest {self.subtest_name.replace("_","-")!r} for {desc}'))
+
+	def process_bad_data(self,data):
 		if os.getenv('PYTHONOPTIMIZE'):
 			ymsg('PYTHONOPTIMIZE set, skipping error handling tests')
 			return
@@ -116,10 +121,10 @@ def run_test(test,subtest=None):
 		msg(f'Running unit subtest {test}.{subtest_disp}')
 		t = getattr(mod,'unit_tests')()
 		if hasattr(t,'_pre_subtest'):
-			getattr(t,'_pre_subtest')(test,subtest,UnitTestHelpers)
-		ret = getattr(t,subtest.replace('-','_'))(test,UnitTestHelpers)
+			getattr(t,'_pre_subtest')(test,subtest,UnitTestHelpers(subtest))
+		ret = getattr(t,subtest.replace('-','_'))(test,UnitTestHelpers(subtest))
 		if hasattr(t,'_post_subtest'):
-			getattr(t,'_post_subtest')(test,subtest,UnitTestHelpers)
+			getattr(t,'_post_subtest')(test,subtest,UnitTestHelpers(subtest))
 		if type(ret).__name__ == 'coroutine':
 			ret = async_run(ret)
 		if not ret:
@@ -141,17 +146,17 @@ def run_test(test,subtest=None):
 			for subtest in subtests:
 				subtest_disp = subtest.replace('_','-')
 				if cfg.no_altcoin_deps and subtest in altcoin_deps:
-					cfg._util.qmsg(gray(f'Invoked with --no-altcoin-deps, so skipping {subtest_disp!r}'))
+					cfg._util.qmsg(gray(f'Invoked with --no-altcoin-deps, so skipping subtest {subtest_disp!r}'))
 					continue
 				if gc.platform == 'win' and subtest in win_skip:
-					cfg._util.qmsg(gray(f'Skipping {subtest_disp!r} for Windows platform'))
+					cfg._util.qmsg(gray(f'Skipping subtest {subtest_disp!r} for Windows platform'))
 					continue
 				elif platform.machine() == 'aarch64' and subtest in arm_skip:
-					cfg._util.qmsg(gray(f'Skipping {subtest_disp!r} for ARM platform'))
+					cfg._util.qmsg(gray(f'Skipping subtest {subtest_disp!r} for ARM platform'))
 					continue
 				run_subtest(subtest)
 		else:
-			if not mod.unit_test().run_test(test,UnitTestHelpers):
+			if not mod.unit_test().run_test(test,UnitTestHelpers(test)):
 				die(4,'Unit test {test!r} failed')
 
 try:
diff --git a/test/unit_tests_d/ut_dep.py b/test/unit_tests_d/ut_dep.py
index 23b03db7..0e420ec6 100755
--- a/test/unit_tests_d/ut_dep.py
+++ b/test/unit_tests_d/ut_dep.py
@@ -31,7 +31,7 @@ class unit_tests:
 	def pysha3(self,name,ut): # ETH,XMR
 		from mmgen.pyversion import python_version
 		if python_version >= '3.11':
-			ymsg(f'Skipping pysha3 for Python version {python_version}')
+			ut.skip_msg(f'Python version {python_version}')
 		else:
 			from sha3 import keccak_256
 		return True
diff --git a/test/unit_tests_d/ut_testdep.py b/test/unit_tests_d/ut_testdep.py
index 352c3ddc..2dcd7f78 100755
--- a/test/unit_tests_d/ut_testdep.py
+++ b/test/unit_tests_d/ut_testdep.py
@@ -51,9 +51,7 @@ class unit_tests:
 		if gc.platform == 'linux' and os.uname().machine != 'x86_64':
 			distro = [l for l in open('/etc/os-release').read().split('\n') if l.startswith('ID=')][0][3:]
 			if distro != 'archarm':
-				ymsg('Skipping ethkey availability test for distro {!r} on architecture {!r}'.format(
-					distro,
-					os.uname().machine ))
+				ut.skip_msg('distro {!r} on architecture {!r}'.format( distro, os.uname().machine ))
 				return True
 		from test.include.common import get_ethkey
 		get_ethkey()