From 271d1361de52c3c2f44e2ed7c3739ba189747264 Mon Sep 17 00:00:00 2001 From: Arne Brutschy Date: Tue, 10 Oct 2017 02:47:56 +0200 Subject: [PATCH] Added forwarding of service logs to python logging --- .gitignore | 2 ++ src/pytest_docker/__init__.py | 13 ++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 30cdffb..f2db8a7 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ /htmlcov/ /pytest_docker.egg-info/ /src/pytest_docker.egg-info/ +/build/ +/dist/ diff --git a/src/pytest_docker/__init__.py b/src/pytest_docker/__init__.py index 9422958..3fa3495 100644 --- a/src/pytest_docker/__init__.py +++ b/src/pytest_docker/__init__.py @@ -8,6 +8,9 @@ import subprocess import time import timeit +import logging + +log = logging.getLogger(__name__) def execute(command, success_codes=(0,)): @@ -177,8 +180,16 @@ def docker_services( # Spawn containers. docker_compose.execute('up --build -d') + services = Services(docker_compose) # Let test(s) run. - yield Services(docker_compose) + yield services + + # Print service logs for debugging. + # noinspection PyProtectedMember + for service in services._services: + output = docker_compose.execute('logs {}'.format(service)) + for line in output.split('\n'): + log.info(line) # Clean up. docker_compose.execute('down -v')