IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-01-26 16:16:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixing cleanup process in test_caless

Browse Source 
After commit bbe615e12c278f9cddaeb38e80b970bf14d9b32d, if the uninstall
process fails (in the test cleanup) the error is not hidden anymore.

That brought light to errors in the cleanup process on
TestReplicaInstall test, like this:
```
RUN ['ipa-server-install', '--uninstall', '-U']
ipapython.admintool: ERROR    Server removal aborted:
Replication topology in suffix 'domain' is disconnected:
Topology does not allow server master.ipa.test to replicate with servers:
    replica0.ipa.test.
ipapython.admintool: ERROR    The ipa-server-install command failed
```

This commit changes the order of how a replica should be removed from
the topology.

Reviewed-By: Petr Vobornik <pvoborni@redhat.com>
Reviewed-By: Christian Heimes <cheimes@redhat.com>
This commit is contained in:
Felipe Barreto 2018-03-01 19:19:05 -03:00 committed by Christian Heimes
parent 5a04936f47
commit 2c05e42af6
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ipatests/test_integration/test_caless.py
View File

@ -105,15 +105,14 @@ def replica_install_teardown(func):
replica = args[0].replicas[0]
master = args[0].master
tasks.kinit_admin(master)
tasks.clean_replication_agreement(master, replica, cleanup=True,
raiseonerr=False)
master.run_command(['ipa', 'host-del', replica.hostname],
raiseonerr=False)
tasks.uninstall_master(replica, clean=False)
# Now let's uninstall client for the cases when client promotion
# was not successful
tasks.uninstall_client(replica)
tasks.clean_replication_agreement(master, replica, cleanup=True,
raiseonerr=False)
master.run_command(['ipa', 'host-del',
replica.hostname],
raiseonerr=False)
ipa_certs_cleanup(replica)
return wrapped