Fabio/nginx-proxy-auto-docker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test: separate containers (contd)

Browse source
This commit is contained in:
Nicolas Duchon 2024-12-23 00:33:24 +01:00
parent ce9e534ad0
commit 8493fc7aea
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/conftest.py
View file

@ -355,10 +355,10 @@ def wait_for_nginxproxy_to_be_ready():
""" """
containers = docker_client.containers.list(filters={"ancestor": f"nginxproxy/nginx-proxy:{IMAGE_TAG}"}) containers = docker_client.containers.list(filters={"ancestor": f"nginxproxy/nginx-proxy:{IMAGE_TAG}"})
if len(containers) > 1: if len(containers) > 1:
logging.info(f"Too many running nginxproxy/nginx-proxy:{IMAGE_TAG} containers") logging.warning(f"Too many running nginxproxy/nginx-proxy:{IMAGE_TAG} containers")
return return
elif len(containers) == 0: elif len(containers) == 0:
logging.info(f"No running nginxproxy/nginx-proxy:{IMAGE_TAG} container") logging.warning(f"No running nginxproxy/nginx-proxy:{IMAGE_TAG} container")
return return
container = containers[0] container = containers[0]
for line in container.logs(stream=True): for line in container.logs(stream=True):

4
test/test_dockergen/test_dockergen.py
View file

@ -3,8 +3,8 @@ import pytest
pytestmark = pytest.mark.skipif( pytestmark = pytest.mark.skipif(
os.environ.get("COMPOSE_PROFILES") == "separateContainers", True,
reason="This test does not need to run in separateContainers mode" reason="This test intefers with the other tests, and might no longer be needed."
) )