浏览代码

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.
Richard Hansen 2 年之前
父节点
当前提交
b5a54ac219
共有 1 个文件被更改,包括 3 次插入3 次删除
  1. 3 3
      test/conftest.py

+ 3 - 3
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.