From effe0011157dde44eedd3b3f98b83b49af6e1c3d Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Mon, 26 Aug 2024 13:46:54 +0000 Subject: [PATCH] cmdtest.py: win_skip -> platform_skip --- test/cmdtest.py | 8 ++------ test/cmdtest_py_d/ct_autosign.py | 3 +-- test/cmdtest_py_d/ct_base.py | 3 +-- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/test/cmdtest.py b/test/cmdtest.py index e6976cd7..cdc8bbf8 100755 --- a/test/cmdtest.py +++ b/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'): diff --git a/test/cmdtest_py_d/ct_autosign.py b/test/cmdtest_py_d/ct_autosign.py index 08273d9b..c95b0052 100755 --- a/test/cmdtest_py_d/ct_autosign.py +++ b/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 = [] diff --git a/test/cmdtest_py_d/ct_base.py b/test/cmdtest_py_d/ct_base.py index a2aa4cf2..bd5cbc1e 100755 --- a/test/cmdtest_py_d/ct_base.py +++ b/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