From 73af4a19a469939d098b9187a10a8e65a8516193 Mon Sep 17 00:00:00 2001
From: Felddy <markf@geekpad.com>
Date: Fri, 2 Feb 2024 14:26:38 -0500
Subject: [PATCH] Refactor container test fixture usage

---
 tests/container_test.py | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/tests/container_test.py b/tests/container_test.py
index cd5eeb58..59380dec 100644
--- a/tests/container_test.py
+++ b/tests/container_test.py
@@ -12,32 +12,30 @@
 VERSION_FILE = "src/_version.py"
 
 
-@pytest.mark.parametrize(
-    "container",
-    [
-        pytest.lazy_fixture("gen_test_config_container"),
-    ],
-)
-def test_gen_config(container):
+def test_gen_config(gen_test_config_container):
     """Test that the test configuration generator has completed."""
     # Wait until the container has exited or timeout.
+
     for _ in range(10):
-        container.reload()
-        if container.status == "exited":
+        gen_test_config_container.reload()
+        if gen_test_config_container.status == "exited":
             break
         time.sleep(1)
-    assert container.status in ("exited")
+    assert gen_test_config_container.status in ("exited")
 
 
 @pytest.mark.parametrize(
     "container",
     [
-        pytest.lazy_fixture("main_container"),
-        pytest.lazy_fixture("version_container"),
+        "main_container",
+        "version_container",
     ],
 )
-def test_container_running(container):
+def test_container_running(container, request):
     """Test that the container has started."""
+    # Lazy fixture evaluation
+    container = request.getfixturevalue(container)
+
     # Wait until the container is running or timeout.
     for _ in range(10):
         container.reload()