49 lines
1.7 KiB
Diff
49 lines
1.7 KiB
Diff
|
From ba7ec71ba96280da3841ebe47df2a6dc1cd6341e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Mohammad Rizwan <myusuf@redhat.com>
|
||
|
|
Date: Fri, 26 Nov 2021 12:11:21 +0530
|
||
|
|
Subject: [PATCH] ipatests: Fix test_ipa_cert_fix.py::TestCertFixReplica
|
||
|
|
teardown
|
||
|
|
|
||
|
|
Fixture `expire_certs` moves date back after renewing the certs.
|
||
|
|
This is causing the ipa-replica to fail. This fix first uninstalls
|
||
|
|
the server then moves back the date.
|
||
|
|
|
||
|
|
Fixes: https://pagure.io/freeipa/issue/9052
|
||
|
|
|
||
|
|
Signed-off-by: Mohammad Rizwan <myusuf@redhat.com>
|
||
|
|
Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
|
||
|
|
---
|
||
|
|
ipatests/test_integration/test_ipa_cert_fix.py | 9 ++++++++-
|
||
|
|
1 file changed, 8 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/ipatests/test_integration/test_ipa_cert_fix.py b/ipatests/test_integration/test_ipa_cert_fix.py
|
||
|
|
index 39904d5de64c59416f01646f437aabf797d57dd9..5b56054b4f16d5654ebeb61971a8775bfaf341b8 100644
|
||
|
|
--- a/ipatests/test_integration/test_ipa_cert_fix.py
|
||
|
|
+++ b/ipatests/test_integration/test_ipa_cert_fix.py
|
||
|
|
@@ -389,6 +389,12 @@ class TestCertFixReplica(IntegrationTest):
|
||
|
|
setup_dns=False, extra_args=['--no-ntp']
|
||
|
|
)
|
||
|
|
|
||
|
|
+ @classmethod
|
||
|
|
+ def uninstall(cls, mh):
|
||
|
|
+ # Uninstall method is empty as the uninstallation is done in
|
||
|
|
+ # the fixture
|
||
|
|
+ pass
|
||
|
|
+
|
||
|
|
@pytest.fixture
|
||
|
|
def expire_certs(self):
|
||
|
|
# move system date to expire certs
|
||
|
|
@@ -398,7 +404,8 @@ class TestCertFixReplica(IntegrationTest):
|
||
|
|
yield
|
||
|
|
|
||
|
|
# move date back on replica and master
|
||
|
|
- for host in self.master, self.replicas[0]:
|
||
|
|
+ for host in self.replicas[0], self.master:
|
||
|
|
+ tasks.uninstall_master(host)
|
||
|
|
tasks.move_date(host, 'start', '-3years-1days')
|
||
|
|
|
||
|
|
def test_renew_expired_cert_replica(self, expire_certs):
|
||
|
|
--
|
||
|
|
2.34.1
|
||
|
|
|