From 207b092c4e1ad80ed8efc41e92069e253724f7dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Tue, 10 Oct 2023 11:59:54 +0200 Subject: [PATCH] Only add marks for containers available for this os version --- bci_tester/data.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/bci_tester/data.py b/bci_tester/data.py index e22267f1..eac03661 100755 --- a/bci_tester/data.py +++ b/bci_tester/data.py @@ -254,7 +254,7 @@ def create_BCI( of the :py:class:`~pytest_container.DerivedContainer` """ build_tag_base = build_tag.rpartition("/")[2] - marks = [pytest.mark.__getattr__(build_tag_base.replace(":", "_"))] + marks = [] if extra_marks: for m in extra_marks: marks.append(m) @@ -277,15 +277,22 @@ def create_BCI( raise ValueError( f"Invalid os version for a language or application stack container: {ver}" ) - marks.append(create_container_version_mark(available_versions)) + # marks.append(create_container_version_mark(available_versions)) else: - marks.append( - create_container_version_mark(_DEFAULT_NONBASE_OS_VERSIONS) - ) + available_versions = list(_DEFAULT_NONBASE_OS_VERSIONS) + # marks.append( + # create_container_version_mark(_DEFAULT_NONBASE_OS_VERSIONS) + # ) - elif available_versions is not None: + if available_versions: marks.append(create_container_version_mark(available_versions)) + # only try to grab the mark from the build tag for containers that are + # available for this os version, otherwise we get bogus errors for missing + # marks + if OS_VERSION in (available_versions or []): + marks.append(pytest.mark.__getattr__(build_tag_base.replace(":", "_"))) + if OS_VERSION == "tumbleweed": if bci_type == ImageType.APPLICATION: baseurl = (