Browse Source

cmdtest.py: win_skip -> platform_skip

The MMGen Project 7 months ago
parent
commit
effe001115
3 changed files with 4 additions and 10 deletions
  1. 2 6
      test/cmdtest.py
  2. 1 2
      test/cmdtest_py_d/ct_autosign.py
  3. 1 2
      test/cmdtest_py_d/ct_base.py

+ 2 - 6
test/cmdtest.py

@@ -660,12 +660,8 @@ class CmdTestRunner:
 
 		ct_cls = CmdGroupMgr().load_mod(gname)
 
-		if sys.platform == 'win32' and ct_cls.win_skip:
-			omsg(gray(f'INFO → skipping test {gname!r} (platform=win32)'))
-			return None
-
-		if sys.platform == 'darwin' and ct_cls.mac_skip:
-			omsg(gray(f'INFO → skipping test {gname!r} (platform=darwin)'))
+		if sys.platform in ct_cls.platform_skip:
+			omsg(gray(f'INFO → skipping test {gname!r} for platform {sys.platform!r}'))
 			return None
 
 		for k in ('segwit','segwit_random','bech32'):

+ 1 - 2
test/cmdtest_py_d/ct_autosign.py

@@ -53,8 +53,7 @@ class CmdTestAutosignBase(CmdTestBase):
 	networks     = ('btc',)
 	tmpdir_nums  = [18]
 	color        = True
-	win_skip     = True
-	mac_skip     = True
+	platform_skip = ('win32', 'darwin')
 	threaded     = False
 	daemon_coins = []
 

+ 1 - 2
test/cmdtest_py_d/ct_base.py

@@ -37,8 +37,7 @@ class CmdTestBase:
 	segwit_opts_ok = False
 	color = False
 	need_daemon = False
-	win_skip = False
-	mac_skip = False
+	platform_skip = ()
 	tmpdir_nums = []
 	test_name = None