test: separate containers (contd)
This commit is contained in:
parent
ce9e534ad0
commit
8493fc7aea
2 changed files with 4 additions and 4 deletions
|
@ -355,10 +355,10 @@ def wait_for_nginxproxy_to_be_ready():
|
|||
"""
|
||||
containers = docker_client.containers.list(filters={"ancestor": f"nginxproxy/nginx-proxy:{IMAGE_TAG}"})
|
||||
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
|
||||
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
|
||||
container = containers[0]
|
||||
for line in container.logs(stream=True):
|
||||
|
|
|
@ -3,8 +3,8 @@ import pytest
|
|||
|
||||
|
||||
pytestmark = pytest.mark.skipif(
|
||||
os.environ.get("COMPOSE_PROFILES") == "separateContainers",
|
||||
reason="This test does not need to run in separateContainers mode"
|
||||
True,
|
||||
reason="This test intefers with the other tests, and might no longer be needed."
|
||||
)
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue