diff --git a/setup.py b/setup.py index f8948b77..268d6926 100644 --- a/setup.py +++ b/setup.py @@ -81,9 +81,8 @@ def package_vars(version_file): "coveralls == 3.3.1", "docker == 7.0.0", "pre-commit == 3.6.0", - "pytest == 7.4.4", + "pytest == 8.0.0", "pytest-cov == 4.1.0", - "pytest-lazy-fixture == 0.6.3", ] }, ) 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()