diff options
| author | Oleg Fayans <ofayans@redhat.com> | 2016-09-21 16:19:57 +0200 |
|---|---|---|
| committer | David Kupka <dkupka@redhat.com> | 2016-09-22 15:20:42 +0200 |
| commit | 9217bcc871468615110c85b1131b62735f9e5092 (patch) | |
| tree | abece6744de98b0bbedb46101fc833cef1355c8d /ipatests/test_integration | |
| parent | e0b67dfa7e957cc134043b265b87ed71bb09a7d3 (diff) | |
| download | freeipa-9217bcc871468615110c85b1131b62735f9e5092.tar.gz freeipa-9217bcc871468615110c85b1131b62735f9e5092.tar.xz freeipa-9217bcc871468615110c85b1131b62735f9e5092.zip | |
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>
Diffstat (limited to 'ipatests/test_integration')
| -rw-r--r-- | ipatests/test_integration/tasks.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ipatests/test_integration/tasks.py b/ipatests/test_integration/tasks.py index f5c27b74e..4701511b1 100644 --- a/ipatests/test_integration/tasks.py +++ b/ipatests/test_integration/tasks.py @@ -681,7 +681,7 @@ def kinit_admin(host, raiseonerr=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) uninstall_cmd = ['ipa-server-install', '--uninstall', '-U'] @@ -708,7 +708,8 @@ def uninstall_master(host, ignore_topology_disconnect=True, "xargs rm -fv", raiseonerr=False) host.run_command("find /run/ipa -name 'krb5*' | xargs rm -fv", raiseonerr=False) - unapply_fixes(host) + if clean: + unapply_fixes(host) def uninstall_client(host): |