URL: https://github.com/freeipa/freeipa/pull/2637
Author: t-woerner
 Title: #2637: ipatests integration/tasks.py: Honor clean for firewall in 
uninstall_master
Action: opened

PR body:
"""
This fix will make sure that the firewall services are only cleaned up if
the clean flag is True for example for backup and restore tests where the
clean flag is set to False for the server uninstall.

See: https://pagure.io/freeipa/issue/7755
Signed-off-by: Thomas Woerner <[email protected]>
"""

To pull the PR as Git branch:
git remote add ghfreeipa https://github.com/freeipa/freeipa
git fetch ghfreeipa pull/2637/head:pr2637
git checkout pr2637
From 2331ad21b15c3abb59de22b5448e002fb78a9bc4 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <[email protected]>
Date: Tue, 4 Dec 2018 12:03:52 +0100
Subject: [PATCH] ipatests integration/tasks.py: Honor clean for firewall in
 uninstall_master

This fix will make sure that the firewall services are only cleaned up if
the clean flag is True for example for backup and restore tests where the
clean flag is set to False for the server uninstall.

See: https://pagure.io/freeipa/issue/7755
Signed-off-by: Thomas Woerner <[email protected]>
---
 ipatests/pytest_ipa/integration/tasks.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ipatests/pytest_ipa/integration/tasks.py b/ipatests/pytest_ipa/integration/tasks.py
index 9940c3ff3b..a19384a295 100644
--- a/ipatests/pytest_ipa/integration/tasks.py
+++ b/ipatests/pytest_ipa/integration/tasks.py
@@ -793,8 +793,9 @@ def uninstall_master(host, ignore_topology_disconnect=True,
 
     result = host.run_command(uninstall_cmd)
     assert "Traceback" not in result.stdout_text
-    Firewall(host).disable_services(["freeipa-ldap", "freeipa-ldaps",
-                                     "freeipa-trust", "dns"])
+    if clean:
+        Firewall(host).disable_services(["freeipa-ldap", "freeipa-ldaps",
+                                         "freeipa-trust", "dns"])
 
     host.run_command(['pkidestroy', '-s', 'CA', '-i', 'pki-tomcat'],
                      raiseonerr=False)
_______________________________________________
FreeIPA-devel mailing list -- [email protected]
To unsubscribe send an email to [email protected]
Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedorahosted.org/archives/list/[email protected]

Reply via email to