From 840f9cfe17737c9ef1899b9923682a5df53ff4b6 Mon Sep 17 00:00:00 2001

From: Florence Blanc-Renaud <flo@redhat.com>

Date: Tue, 4 Dec 2018 16:44:54 +0100

Subject: [PATCH] ipatests: fix TestUpgrade::test_double_encoded_cacert

The test is using a stale ldap connection to the master

(obtained before calling upgrade, and the upgrade stops

and starts 389-ds, breaking the connection).

The fix re-connects before using the ldap handle.

Related to https://pagure.io/freeipa/issue/7775

---

 ipatests/test_integration/test_upgrade.py | 2 ++

 1 file changed, 2 insertions(+)

diff --git a/ipatests/test_integration/test_upgrade.py b/ipatests/test_integration/test_upgrade.py

index 7dbe52d57052d3c640df644705fc3e22fab14334..b03109f7c3bb0f037c8fd6554e3e5420bc557684 100644

--- a/ipatests/test_integration/test_upgrade.py

+++ b/ipatests/test_integration/test_upgrade.py

@@ -47,6 +47,8 @@ class TestUpgrade(IntegrationTest):

         # try the upgrade

         self.master.run_command(['ipa-server-upgrade'])

+        # reconnect to the master (upgrade stops 389-ds)

+        ldap = self.master.ldap_connect()

         # read the value after upgrade, should be fixed

         entry = ldap.get_entry(dn)  # pylint: disable=no-member

         try:

-- 

2.17.2