From 82f7857a94149873d8093a2a023ccf2ff9880900 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Tue, 10 Dec 2024 15:54:30 -0500 Subject: [PATCH] twister: debug: change skipped -> filtered Change debug message to say filtered instead of skipped. Signed-off-by: Anas Nashif --- .../pylib/twister/twisterlib/twister_main.py | 2 +- scripts/tests/twister_blackbox/test_filter.py | 28 +++++++++---------- .../tests/twister_blackbox/test_quarantine.py | 12 ++++---- scripts/tests/twister_blackbox/test_runner.py | 8 +++--- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/scripts/pylib/twister/twisterlib/twister_main.py b/scripts/pylib/twister/twisterlib/twister_main.py index 1fbd2ffac4d..9d4485c885e 100644 --- a/scripts/pylib/twister/twisterlib/twister_main.py +++ b/scripts/pylib/twister/twisterlib/twister_main.py @@ -147,7 +147,7 @@ def main(options: argparse.Namespace, default_options: argparse.Namespace): continue logger.debug( f"{i.platform.name:<25} {i.testsuite.name:<50}" - f" {Fore.YELLOW}SKIPPED{Fore.RESET}: {i.reason}" + f" {Fore.YELLOW}FILTERED{Fore.RESET}: {i.reason}" ) report = Reporting(tplan, env) diff --git a/scripts/tests/twister_blackbox/test_filter.py b/scripts/tests/twister_blackbox/test_filter.py index 3558296d40b..c0da4270c37 100644 --- a/scripts/tests/twister_blackbox/test_filter.py +++ b/scripts/tests/twister_blackbox/test_filter.py @@ -24,47 +24,47 @@ class TestFilter: ( 'x86', [ - r'(it8xxx2_evb/it81302bx).*?(SKIPPED: Command line testsuite arch filter)', + r'(it8xxx2_evb/it81302bx).*?(FILTERED: Command line testsuite arch filter)', ], ), ( 'arm', [ - r'(it8xxx2_evb/it81302bx).*?(SKIPPED: Command line testsuite arch filter)', - r'(qemu_x86/atom).*?(SKIPPED: Command line testsuite arch filter)', - r'(hsdk/arc_hsdk).*?(SKIPPED: Command line testsuite arch filter)', + r'(it8xxx2_evb/it81302bx).*?(FILTERED: Command line testsuite arch filter)', + r'(qemu_x86/atom).*?(FILTERED: Command line testsuite arch filter)', + r'(hsdk/arc_hsdk).*?(FILTERED: Command line testsuite arch filter)', ] ), ( 'riscv', [ - r'(qemu_x86/atom).*?(SKIPPED: Command line testsuite arch filter)', - r'(hsdk/arc_hsdk).*?(SKIPPED: Command line testsuite arch filter)', ] + r'(qemu_x86/atom).*?(FILTERED: Command line testsuite arch filter)', + r'(hsdk/arc_hsdk).*?(FILTERED: Command line testsuite arch filter)', ] ) ] TESTDATA_2 = [ ( 'nxp', [ - r'(it8xxx2_evb/it81302bx).*?(SKIPPED: Not a selected vendor platform)', - r'(hsdk/arc_hsdk).*?(SKIPPED: Not a selected vendor platform)', - r'(qemu_x86).*?(SKIPPED: Not a selected vendor platform)', + r'(it8xxx2_evb/it81302bx).*?(FILTERED: Not a selected vendor platform)', + r'(hsdk/arc_hsdk).*?(FILTERED: Not a selected vendor platform)', + r'(qemu_x86).*?(FILTERED: Not a selected vendor platform)', ], ), ( 'intel', [ - r'(it8xxx2_evb/it81302bx).*?(SKIPPED: Not a selected vendor platform)', - r'(qemu_x86/atom).*?(SKIPPED: Not a selected vendor platform)', + r'(it8xxx2_evb/it81302bx).*?(FILTERED: Not a selected vendor platform)', + r'(qemu_x86/atom).*?(FILTERED: Not a selected vendor platform)', r'(DEBUG\s+- adding intel_adl_crb)' ] ), ( 'ite', [ - r'(qemu_x86/atom).*?(SKIPPED: Not a selected vendor platform)', - r'(intel_adl_crb/alder_lake).*?(SKIPPED: Not a selected vendor platform)', - r'(hsdk/arc_hsdk).*?(SKIPPED: Not a selected vendor platform)', + r'(qemu_x86/atom).*?(FILTERED: Not a selected vendor platform)', + r'(intel_adl_crb/alder_lake).*?(FILTERED: Not a selected vendor platform)', + r'(hsdk/arc_hsdk).*?(FILTERED: Not a selected vendor platform)', r'(DEBUG\s+- adding it8xxx2_evb)' ] ) diff --git a/scripts/tests/twister_blackbox/test_quarantine.py b/scripts/tests/twister_blackbox/test_quarantine.py index 404e0be2b07..61cfa9634e3 100644 --- a/scripts/tests/twister_blackbox/test_quarantine.py +++ b/scripts/tests/twister_blackbox/test_quarantine.py @@ -89,26 +89,26 @@ class TestQuarantine: sys.stdout.write(out) sys.stderr.write(err) - board1_match1 = re.search('agnostic/group2/dummy.agnostic.group2 SKIPPED: Quarantine: test ' + board1_match1 = re.search('agnostic/group2/dummy.agnostic.group2 FILTERED: Quarantine: test ' 'intel_adl_crb', err) board1_match2 = re.search( - 'agnostic/group1/subgroup2/dummy.agnostic.group1.subgroup2 SKIPPED: Quarantine: test ' + 'agnostic/group1/subgroup2/dummy.agnostic.group1.subgroup2 FILTERED: Quarantine: test ' 'intel_adl_crb', err) qemu_64_match = re.search( - 'agnostic/group1/subgroup2/dummy.agnostic.group1.subgroup2 SKIPPED: Quarantine: test ' + 'agnostic/group1/subgroup2/dummy.agnostic.group1.subgroup2 FILTERED: Quarantine: test ' 'qemu_x86_64', err) all_platforms_match = re.search( - 'agnostic/group1/subgroup1/dummy.agnostic.group1.subgroup1 SKIPPED: Quarantine: test ' + 'agnostic/group1/subgroup1/dummy.agnostic.group1.subgroup1 FILTERED: Quarantine: test ' 'all platforms', err) all_platforms_match2 = re.search( - 'agnostic/group1/subgroup1/dummy.agnostic.group1.subgroup1 SKIPPED: Quarantine: test ' + 'agnostic/group1/subgroup1/dummy.agnostic.group1.subgroup1 FILTERED: Quarantine: test ' 'all platforms', err) all_platforms_match3 = re.search( - 'agnostic/group1/subgroup1/dummy.agnostic.group1.subgroup1 SKIPPED: Quarantine: test ' + 'agnostic/group1/subgroup1/dummy.agnostic.group1.subgroup1 FILTERED: Quarantine: test ' 'all platforms', err) diff --git a/scripts/tests/twister_blackbox/test_runner.py b/scripts/tests/twister_blackbox/test_runner.py index e1b6a194703..4dc6a9fb078 100644 --- a/scripts/tests/twister_blackbox/test_runner.py +++ b/scripts/tests/twister_blackbox/test_runner.py @@ -128,9 +128,9 @@ class TestRunner: os.path.join(TEST_DATA, 'tests', 'dummy'), ['qemu_x86/atom'], ['device'], - ['dummy.agnostic.group2 SKIPPED: Command line testsuite tag filter', - 'dummy.agnostic.group1.subgroup2 SKIPPED: Command line testsuite tag filter', - 'dummy.agnostic.group1.subgroup1 SKIPPED: Command line testsuite tag filter', + ['dummy.agnostic.group2 FILTERED: Command line testsuite tag filter', + 'dummy.agnostic.group1.subgroup2 FILTERED: Command line testsuite tag filter', + 'dummy.agnostic.group1.subgroup1 FILTERED: Command line testsuite tag filter', r'0 of 0 executed test configurations passed \(0.00%\), 0 built \(not run\), 0 failed, 0 errored' ] ), @@ -138,7 +138,7 @@ class TestRunner: os.path.join(TEST_DATA, 'tests', 'dummy'), ['qemu_x86/atom'], ['subgrouped'], - ['dummy.agnostic.group2 SKIPPED: Command line testsuite tag filter', + ['dummy.agnostic.group2 FILTERED: Command line testsuite tag filter', r'1 of 2 executed test configurations passed \(50.00%\), 1 built \(not run\), 0 failed, 0 errored' ] ),