Skip to content

[action] [PR:25930] [conditional_mark] Fix nodeid normalization so skips apply when rootdir floats above tests/ #1328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mssonicbld merged 1 commit into from
Jul 23, 2026
Merged

[action] [PR:25930] [conditional_mark] Fix nodeid normalization so skips apply when rootdir floats above tests/ #1328

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion tests/common/plugins/conditional_mark/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -710,12 +710,16 @@ def pytest_collection_modifyitems(session, config, items):
json.dumps(basic_facts, indent=2)))
dynamic_update_skip_reason = session.config.option.dynamic_update_skip_reason
basic_facts['constants'] = MARK_CONDITIONS_CONSTANTS
# Normalize nodeids: strip root directory prefix if present (pytest 9.0+ includes it)
# Normalize nodeids to match the tests/-relative condition keys. rootdir may
# float above tests/ (e.g. --inventory ../ansible/veos_vtb), so strip both
# basename(rootpath) and a leading "tests/" or all conditional skips no-op.
root_prefix = os.path.basename(str(session.config.rootpath)) + "/"
for item in items:
nodeid = item.nodeid
if nodeid.startswith(root_prefix):
nodeid = nodeid[len(root_prefix):]
if nodeid.startswith("tests/"):
nodeid = nodeid[len("tests/"):]
all_matches = find_all_matches(nodeid, conditions, session, dynamic_update_skip_reason, basic_facts)

if all_matches:
Expand Down