URL: https://github.com/freeipa/freeipa/pull/1683
Author: tiran
Title: #1683: [Backport][ipa-4-6] Fixing cleanup process in test_caless
Action: opened
PR body:
"""
This PR was opened automatically because PR #1646 was pushed to master and
backport to ipa-4-6 is required.
"""
To pull the PR as Git branch:
git remote add ghfreeipa https://github.com/freeipa/freeipa
git fetch ghfreeipa pull/1683/head:pr1683
git checkout pr1683
From 96d8b5ea96a4c9c3936696e97c2079b0329b3da4 Mon Sep 17 00:00:00 2001
From: Felipe Barreto <fbarr...@redhat.com>
Date: Thu, 1 Mar 2018 19:19:05 -0300
Subject: [PATCH] Fixing cleanup process in test_caless
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.
---
ipatests/test_integration/test_caless.py | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/ipatests/test_integration/test_caless.py b/ipatests/test_integration/test_caless.py
index c6f75cc120..16e7afbd3b 100644
--- a/ipatests/test_integration/test_caless.py
+++ b/ipatests/test_integration/test_caless.py
@@ -104,15 +104,14 @@ def wrapped(*args):
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
_______________________________________________
FreeIPA-devel mailing list -- freeipa-devel@lists.fedorahosted.org
To unsubscribe send an email to freeipa-devel-le...@lists.fedorahosted.org
