From 2c9d635bc8488944e5dc0077719a425e0185dd32 Mon Sep 17 00:00:00 2001 From: Arne Brutschy Date: Mon, 20 Nov 2017 09:55:04 +0100 Subject: [PATCH 1/3] Adds `get_logs()` to fetch container logs. --- src/pytest_docker/__init__.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/pytest_docker/__init__.py b/src/pytest_docker/__init__.py index 9422958..31beb5f 100644 --- a/src/pytest_docker/__init__.py +++ b/src/pytest_docker/__init__.py @@ -101,6 +101,12 @@ def wait_until_responsive(self, check, timeout, pause, 'Timeout reached while waiting on service!' ) + def get_logs(self, service): + """Fetches the logs of the container of the specified service. + + Use `get_logs.split('\n')` to parse log by line.""" + return self._docker_compose.execute('logs {}'.format(service)) + def str_to_list(arg): if isinstance(arg, (list, tuple)): From dae0abe70412bdbd28fbc6879dfc7ee09c8aa27d Mon Sep 17 00:00:00 2001 From: Arne Brutschy Date: Mon, 20 Nov 2017 09:55:56 +0100 Subject: [PATCH 2/3] Add build and dist temp dirs to gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 30cdffb..fddbf5f 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ /htmlcov/ /pytest_docker.egg-info/ /src/pytest_docker.egg-info/ +build +dist From 324a198fb6be7f1e4a01827e1477313cf63cb98a Mon Sep 17 00:00:00 2001 From: Arne Brutschy Date: Mon, 20 Nov 2017 09:59:11 +0100 Subject: [PATCH 3/3] Adjust readme to give get_logs example --- README.rst | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 36cc47b..2b4cfc1 100644 --- a/README.rst +++ b/README.rst @@ -45,7 +45,11 @@ responds over HTTP:: timeout=30.0, pause=0.1, check=lambda: is_responsive(url) ) - return url + yield url + + # Optionally print/log container logs for debugging. + for line in docker_services.get_logs('abc').split('\n'): + log.debug(line) def test_something(some_http_service): """Sample test."""