michaelh/zephyr
1
0
Fork 0
Code Releases Activity

twister: Refactor "skip to error" method

Browse source 
Use filter statuses instead of string matching in case of quarantine.

Signed-off-by: Maciej Perkowski <Maciej.Perkowski@nordicsemi.no>
This commit is contained in:
Maciej Perkowski 2023-09-19 13:20:37 +02:00 • committed by Carles Cufí
commit 2f7364fa0a
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scripts/pylib/twister/twisterlib/testplan.py
View file

@ -1006,12 +1006,12 @@ class TestPlan:
def change_skip_to_error_if_integration(options, instance):
''' All skips on integration_platforms are treated as errors.'''
if instance.platform.name in instance.testsuite.integration_platforms \
and "quarantine" not in instance.reason.lower():
# Do not treat this as error for a list of filter types.
if instance.platform.name in instance.testsuite.integration_platforms:
# Do not treat this as error if filter type is among ignore_filters
filters = {t['type'] for t in instance.filters}
ignore_filters ={Filters.CMD_LINE, Filters.SKIP, Filters.PLATFORM_KEY,
Filters.TOOLCHAIN, Filters.MODULE, Filters.TESTPLAN}
Filters.TOOLCHAIN, Filters.MODULE, Filters.TESTPLAN,
Filters.QUARANTINE}
if filters.intersection(ignore_filters):
return
instance.status = "error"