sts-sponsors team mailing list archive
-
sts-sponsors team
-
Mailing list archive
-
Message #08635
[Merge] ~lloydwaltersj/maas-ci/+git/system-tests:allow-test-with-empty-images into ~maas-committers/maas-ci/+git/system-tests:master
Jack Lloyd-Walters has proposed merging ~lloydwaltersj/maas-ci/+git/system-tests:allow-test-with-empty-images into ~maas-committers/maas-ci/+git/system-tests:master.
Commit message:
allow executing `test_full_circle without` an image field in the config
Requested reviews:
MAAS Lander (maas-lander): unittests
MAAS Committers (maas-committers)
For more details, see:
https://code.launchpad.net/~lloydwaltersj/maas-ci/+git/system-tests/+merge/443491
--
Your team MAAS Committers is requested to review the proposed merge of ~lloydwaltersj/maas-ci/+git/system-tests:allow-test-with-empty-images into ~maas-committers/maas-ci/+git/system-tests:master.
diff --git a/systemtests/conftest.py b/systemtests/conftest.py
index 747797d..3a448cc 100644
--- a/systemtests/conftest.py
+++ b/systemtests/conftest.py
@@ -289,8 +289,7 @@ def hardware_sync_machine(
@pytest.fixture(scope="module")
def images_to_test(request: Any) -> Iterator[TestableImage]:
- images_to_test = request.param
- yield images_to_test
+ yield getattr(request, "param", [])
def generate_images(config: dict[str, Any]) -> list[TestableImage]:
@@ -345,6 +344,10 @@ def pytest_generate_tests(metafunc: Metafunc) -> None:
metafunc.parametrize("instance_config", instance_config, ids=str, indirect=True)
if "images_to_test" in metafunc.fixturenames:
- images_to_test = [image for image in generate_images(cfg) if image.url]
- LOG.info(f"Testing images: {', '.join(str(image) for image in images_to_test)}")
- metafunc.parametrize("images_to_test", images_to_test, ids=str, indirect=True)
+ if images_to_test := [image for image in generate_images(cfg) if image.url]:
+ LOG.info(
+ f"Testing images: {', '.join(str(image) for image in images_to_test)}"
+ )
+ metafunc.parametrize(
+ "images_to_test", images_to_test or None, ids=str, indirect=True
+ )