thib8956/nginx-proxy
1
0
Fork 0
mirror of https://github.com/thib8956/nginx-proxy synced 2024-11-22 03:46:29 +00:00
Code Issues Releases Wiki Activity

TESTS: adjust logging (when using pytest -s)

Browse Source
This commit is contained in:
Thomas LEVEIL 2017-01-27 03:31:33 +01:00
parent 150365e784
commit 889dfea4ca
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test2/conftest.py
View File

@ -12,7 +12,7 @@ import docker
import pytest import pytest
import requests import requests
logging.basicConfig(level=logging.WARNING) logging.basicConfig(level=logging.INFO)
logging.getLogger('backoff').setLevel(logging.INFO) logging.getLogger('backoff').setLevel(logging.INFO)
logging.getLogger('patched DNS').setLevel(logging.INFO) logging.getLogger('patched DNS').setLevel(logging.INFO)
@ -134,6 +134,7 @@ def remove_all_containers():
for info in docker_client.containers(all=True): for info in docker_client.containers(all=True):
if I_AM_RUNNING_INSIDE_A_DOCKER_CONTAINER and info['Id'].startswith(socket.gethostname()): if I_AM_RUNNING_INSIDE_A_DOCKER_CONTAINER and info['Id'].startswith(socket.gethostname()):
continue # pytest is running within a Docker container, so we do not want to remove that particular container continue # pytest is running within a Docker container, so we do not want to remove that particular container
logging.info("removing container %s" % info["Id"])
docker_client.remove_container(info["Id"], v=True, force=True) docker_client.remove_container(info["Id"], v=True, force=True)
@ -151,6 +152,7 @@ def get_nginx_conf_from_container(container_id):
def docker_compose_up(compose_file='docker-compose.yml'): def docker_compose_up(compose_file='docker-compose.yml'):
logging.info('docker-compose -f %s up -d' % compose_file)
try: try:
subprocess.check_output(shlex.split('docker-compose -f %s up -d' % compose_file)) subprocess.check_output(shlex.split('docker-compose -f %s up -d' % compose_file))
except subprocess.CalledProcessError, e: except subprocess.CalledProcessError, e:
@ -201,7 +203,7 @@ def find_docker_compose_file(request):
if not os.path.isfile(docker_compose_file): if not os.path.isfile(docker_compose_file):
logging.error("Could not find any docker-compose file named either '{0}.yml', '{0}.yaml' or 'docker-compose.yml'".format(request.module.__name__)) logging.error("Could not find any docker-compose file named either '{0}.yml', '{0}.yaml' or 'docker-compose.yml'".format(request.module.__name__))
logging.info("using docker compose file %s" % docker_compose_file) logging.debug("using docker compose file %s" % docker_compose_file)
return docker_compose_file return docker_compose_file