From b5a54ac2191041dfa06c151fea6f5a832862c0cb Mon Sep 17 00:00:00 2001 From: Richard Hansen Date: Sun, 5 Feb 2023 19:56:14 -0500 Subject: [PATCH] tests: Reduce scope of `docker_compose` fixture (and friends) This makes it possible to bring up different compose files for different tests in the same test module. This change does not negatively affect performance because the fixture is a no-op if the docker compose filename is unchanged between tests. --- test/conftest.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/conftest.py b/test/conftest.py index 13ff689..e7133e7 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -323,7 +323,7 @@ def wait_for_nginxproxy_to_be_ready(): break -@pytest.fixture(scope="module") +@pytest.fixture def docker_compose_file(request): """Fixture naming the docker-compose file to consider. @@ -463,14 +463,14 @@ def ca_root_certificate(): return CA_ROOT_CERTIFICATE -@pytest.fixture(scope="module") +@pytest.fixture def monkey_patched_dns(): original_dns_resolver = monkey_patch_urllib_dns_resolver() yield restore_urllib_dns_resolver(original_dns_resolver) -@pytest.fixture(scope="module") +@pytest.fixture def docker_compose(monkey_patched_dns, docker_composer, docker_compose_file): """Ensures containers described in a docker compose file are started.