URL: https://github.com/freeipa/freeipa/pull/865
Author: tomaskrizek
 Title: #865: ipatests: do not collect systemd journal when logfile_dir is 
Action: synchronized

To pull the PR as Git branch:
git remote add ghfreeipa https://github.com/freeipa/freeipa
git fetch ghfreeipa pull/865/head:pr865
git checkout pr865
From 57bd7b62101bda298f991fbeb0295f1e41840f38 Mon Sep 17 00:00:00 2001
From: Tomas Krizek <tkri...@redhat.com>
Date: Fri, 9 Jun 2017 14:34:10 +0200
Subject: [PATCH] ipatests: do not collect systemd journal when logfile_dir is

If logs aren't collected to logfile_dir, skip collection of systemd

Related https://pagure.io/freeipa/issue/6971

Signed-off-by: Tomas Krizek <tkri...@redhat.com>
 ipatests/pytest_plugins/integration/__init__.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ipatests/pytest_plugins/integration/__init__.py b/ipatests/pytest_plugins/integration/__init__.py
index 20e60e9192..6191c663bb 100644
--- a/ipatests/pytest_plugins/integration/__init__.py
+++ b/ipatests/pytest_plugins/integration/__init__.py
@@ -82,6 +82,9 @@ def collect_systemd_journal(node, hosts, test_config):
     name = _get_logname_from_node(node)
     logfile_dir = test_config.getoption('logfile_dir')
+    if logfile_dir is None:
+        return
     for host in hosts:
         log.info("Collecting journal from: %s", host.hostname)
FreeIPA-devel mailing list -- freeipa-devel@lists.fedorahosted.org
To unsubscribe send an email to freeipa-devel-le...@lists.fedorahosted.org

Reply via email to