Skip to content

Fix skipif marker handling #1155

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
mollyxu merged 3 commits into from
Jan 9, 2026
Merged

Fix skipif marker handling #1155

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb5bbc4
address edge case
Jan 7, 2026
32bede4
Address comment
mollyxu Jan 8, 2026
2ad5d7d
fix lint
Jan 8, 2026
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
9 changes: 7 additions & 2 deletions test/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,17 @@ def pytest_collection_modifyitems(items):
needs_cuda = item.get_closest_marker("needs_cuda") is not None
needs_ffmpeg_cli = item.get_closest_marker("needs_ffmpeg_cli") is not None
has_skip_marker = item.get_closest_marker("skip") is not None
has_skipif_marker = item.get_closest_marker("skipif") is not None

# For skipif, the marker is always present regardless of whether the
# condition is True or False, so we must check the actual condition.
skipif_condition_is_true = any(
skipif_marker.args[0] for skipif_marker in item.iter_markers("skipif")
)

if in_fbcode():
# fbcode doesn't like skipping tests, so instead we just don't collect the test
# so that they don't even "exist", hence the continue statements.
if needs_ffmpeg_cli or has_skip_marker or has_skipif_marker:
if needs_ffmpeg_cli or has_skip_marker or skipif_condition_is_true:
continue

if (
Expand Down
Loading