tests: Made unapply_fixes call optional at master uninstallation

Unapply fixes removes the temporary testing folder at ~/ipatests, which
contains some artifacts like root.pem that need to be persistent between tests
in the test_caless testsuite. There has to be the way to skip the deletion of
this testfolder

Reviewed-By: David Kupka <dkupka@redhat.com>
This commit is contained in:
Oleg Fayans 2016-09-21 16:19:57 +02:00 committed by David Kupka
parent e0b67dfa7e
commit 9217bcc871

View File

@ -681,7 +681,7 @@ def kinit_admin(host, raiseonerr=True):
def uninstall_master(host, ignore_topology_disconnect=True, def uninstall_master(host, ignore_topology_disconnect=True,
ignore_last_of_role=True): ignore_last_of_role=True, clean=True):
host.collect_log(paths.IPASERVER_UNINSTALL_LOG) host.collect_log(paths.IPASERVER_UNINSTALL_LOG)
uninstall_cmd = ['ipa-server-install', '--uninstall', '-U'] uninstall_cmd = ['ipa-server-install', '--uninstall', '-U']
@ -708,7 +708,8 @@ def uninstall_master(host, ignore_topology_disconnect=True,
"xargs rm -fv", raiseonerr=False) "xargs rm -fv", raiseonerr=False)
host.run_command("find /run/ipa -name 'krb5*' | xargs rm -fv", host.run_command("find /run/ipa -name 'krb5*' | xargs rm -fv",
raiseonerr=False) raiseonerr=False)
unapply_fixes(host) if clean:
unapply_fixes(host)
def uninstall_client(host): def uninstall_client(host):