Skip to content

Commit 7c92583

Browse files
hmeirclaude
andcommitted
filter: deselect multiarch tests on non-multiarch clusters
Add filter_multiarch_tests() to pytest_collection_modifyitems. Multiarch-marked tests are deselected on homogeneous clusters, preventing validate_collected_tests_arch_params from erroring during collection-only runs (e.g. tox pytest-check-x86). Signed-off-by: Harel Meir <hmeir@redhat.com> Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
1 parent 6f39d08 commit 7c92583

1 file changed

Lines changed: 11 additions & 0 deletions

File tree

conftest.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
from utilities.bitwarden import get_cnv_tests_secret_by_name
3434
from utilities.constants import (
3535
AMD_64,
36+
MULTIARCH,
3637
QUARANTINED,
3738
SETUP_ERROR,
3839
TIMEOUT_5MIN,
@@ -558,6 +559,15 @@ def filter_sno_only_tests(items: list[Item], config: Config) -> list[Item]:
558559
return items
559560

560561

562+
def filter_multiarch_tests(items: list[Item], config: Config) -> list[Item]:
563+
if py_config.get("cluster_type") == MULTIARCH:
564+
return items
565+
discard_tests, items_to_return = remove_tests_from_list(items=items, filter_str="multiarch")
566+
if discard_tests:
567+
config.hook.pytest_deselected(items=discard_tests)
568+
return items_to_return
569+
570+
561571
def remove_tests_from_list(items: list[Item], filter_str: str) -> tuple[list[Item], list[Item]]:
562572
discard_tests: list[Item] = []
563573
items_to_return: list[Item] = []
@@ -635,6 +645,7 @@ def pytest_collection_modifyitems(session, config, items):
635645
config.hook.pytest_deselected(items=discard)
636646
items[:] = filter_deprecated_api_tests(items=items, config=config)
637647
items[:] = filter_sno_only_tests(items=items, config=config)
648+
items[:] = filter_multiarch_tests(items=items, config=config)
638649
items[:] = mark_nmstate_dependent_tests(items=items)
639650

640651

0 commit comments

Comments
 (0)