From c1b7f61d675f75153599a52285f05aeb762df10d Mon Sep 17 00:00:00 2001 From: Yutong Zhang Date: Wed, 11 Sep 2024 15:49:00 +0800 Subject: [PATCH 1/2] Bugfix --- tests/common/plugins/conditional_mark/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/common/plugins/conditional_mark/__init__.py b/tests/common/plugins/conditional_mark/__init__.py index f92dc5bfd4..c62167093b 100644 --- a/tests/common/plugins/conditional_mark/__init__.py +++ b/tests/common/plugins/conditional_mark/__init__.py @@ -441,6 +441,7 @@ def find_all_matches(nodeid, conditions): case_starting_substring: { mark: match[case_starting_substring][mark]} }}) + max_length = length # We may have the same matches of different marks # Need to remove duplicate here From d8b8c8fc99e4aed28288ccd527aa2251c17b3817 Mon Sep 17 00:00:00 2001 From: Yutong Zhang Date: Thu, 12 Sep 2024 11:25:53 +0800 Subject: [PATCH 2/2] Fix --- tests/common/plugins/conditional_mark/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/common/plugins/conditional_mark/__init__.py b/tests/common/plugins/conditional_mark/__init__.py index c62167093b..4ff2d5d1a8 100644 --- a/tests/common/plugins/conditional_mark/__init__.py +++ b/tests/common/plugins/conditional_mark/__init__.py @@ -428,7 +428,7 @@ def find_all_matches(nodeid, conditions): marks = match[case_starting_substring].keys() for mark in marks: if mark in conditional_marks: - if length > max_length: + if length >= max_length: conditional_marks.update({ mark: { case_starting_substring: {