Make IntegrationTest fail if an error happened during uninstall

Before this change, if the uninstall process fails, the test would not fail, due
to the raiseonerr=False.

It's necessary to remove the uninstall call in CALessBase because in
TestIntegration there is another uninstall call. So, without the
raiseonerr=False, it would make the uninstall process fail, since the master is
already uninstalled.

https://pagure.io/freeipa/issue/7357

Reviewed-By: Christian Heimes <cheimes@redhat.com>
This commit is contained in:
Felipe Barreto authored and Christian Heimes committed 2018-02-07 13:24:46 +01:00
1 parent 6c81a2cb50
commit d945583cc7
2 files changed
+1 -3

No files matched your search

+1 -1
View File
@@ -711,7 +711,7 @@ def uninstall_master(host, ignore_topology_disconnect=True,
if ignore_last_of_role and host_domain_level != DOMAIN_LEVEL_0:
uninstall_cmd.append('--ignore-last-of-role')
host.run_command(uninstall_cmd, raiseonerr=False)
host.run_command(uninstall_cmd)
host.run_command(['pkidestroy', '-s', 'CA', '-i', 'pki-tomcat'],
raiseonerr=False)
host.run_command(['rm', '-rf',
-2
View File
@@ -162,8 +162,6 @@ class CALessBase(IntegrationTest):
def uninstall(cls, mh):
# Remove the NSS database
shutil.rmtree(cls.cert_dir)
for host in cls.get_all_hosts():
tasks.uninstall_master(host)
super(CALessBase, cls).uninstall(mh)
@classmethod