Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion tests/common/plugins/conditional_mark/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand All @@ -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
Expand Down