thib8956/nginx-proxy
1
0
Fork 0
mirror of https://github.com/thib8956/nginx-proxy synced 2025-02-24 01:38:15 +00:00
Code Issues Releases Wiki Activity

tests: Reduce scope of docker_compose fixture (and friends)

Browse Source 
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.
This commit is contained in:
Richard Hansen 2023-02-05 19:56:14 -05:00
parent 4d8f878ba7
commit b5a54ac219
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/conftest.py
View File

@ -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.