URL: https://github.com/freeipa/freeipa/pull/1176 Author: Tiboris Title: #1176: [Backport][ipa-4-6] ipatests: Fix on logs collection Action: opened
PR body: """ This PR was opened automatically because PR #1168 was pushed to master and backport to ipa-4-6 is required. """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/1176/head:pr1176 git checkout pr1176
From 7d11a7a367cce9c91fcfdffec861dc2677c1e5d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C4=8Cech?= <pc...@redhat.com> Date: Mon, 16 Oct 2017 13:13:32 +0200 Subject: [PATCH] ipatests: Fix on logs collection If the function `install_kra` or `install_ca` fails on call `host.run_command(command, raiseonerr=raiseonerr)` then the logs are not collected. This situation is not optimal because we need to see what happend during the debbuging the tests. So, this patch solves this situation and it adds try--finally construction. https://pagure.io/freeipa/issue/7214 --- ipatests/pytest_plugins/integration/tasks.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/ipatests/pytest_plugins/integration/tasks.py b/ipatests/pytest_plugins/integration/tasks.py index b5e393ab75..253508ec45 100644 --- a/ipatests/pytest_plugins/integration/tasks.py +++ b/ipatests/pytest_plugins/integration/tasks.py @@ -1163,8 +1163,10 @@ def install_kra(host, domain_level=None, first_instance=False, raiseonerr=True): if domain_level == DOMAIN_LEVEL_0 and not first_instance: replica_file = get_replica_filename(host) command.append(replica_file) - result = host.run_command(command, raiseonerr=raiseonerr) - setup_server_logs_collecting(host) + try: + result = host.run_command(command, raiseonerr=raiseonerr) + finally: + setup_server_logs_collecting(host) return result @@ -1184,8 +1186,10 @@ def install_ca(host, domain_level=None, first_instance=False, if cert_files: for fname in cert_files: command.extend(['--external-cert-file', fname]) - result = host.run_command(command, raiseonerr=raiseonerr) - setup_server_logs_collecting(host) + try: + result = host.run_command(command, raiseonerr=raiseonerr) + finally: + setup_server_logs_collecting(host) return result
_______________________________________________ FreeIPA-devel mailing list -- freeipa-devel@lists.fedorahosted.org To unsubscribe send an email to freeipa-devel-le...@lists.fedorahosted.org
