From eeb27f7b500b20dc0bd78e06a0f7aefc871cd43c Mon Sep 17 00:00:00 2001 From: Thomas LEVEIL Date: Tue, 14 Feb 2017 02:12:22 +0100 Subject: [PATCH] TESTS: fix failure raising when cannot get nginx-proxy nginx configuration file --- test2/conftest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test2/conftest.py b/test2/conftest.py index e95987d..f57cfbd 100644 --- a/test2/conftest.py +++ b/test2/conftest.py @@ -48,9 +48,9 @@ class requests_for_docker(object): """ nginx_proxy_containers = docker_client.containers.list(filters={"ancestor": "jwilder/nginx-proxy:test"}) if len(nginx_proxy_containers) > 1: - pytest.failed("Too many running jwilder/nginx-proxy:test containers") + pytest.fail("Too many running jwilder/nginx-proxy:test containers", pytrace=False) elif len(nginx_proxy_containers) == 0: - pytest.failed("No running jwilder/nginx-proxy:test container") + pytest.fail("No running jwilder/nginx-proxy:test container", pytrace=False) return get_nginx_conf_from_container(nginx_proxy_containers[0]) def get(self, *args, **kwargs):