74 lines
2.6 KiB
Diff
74 lines
2.6 KiB
Diff
|
From 4a3a15f45aad016730252c09e3e173a18184603e Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Fran=C3=A7ois=20Cami?= <fcami@redhat.com>
|
||
|
|
Date: Wed, 21 Jul 2021 14:29:31 +0200
|
||
|
|
Subject: [PATCH] ipatests: refactor test_ipa_cert_fix with tasks
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Fixes: https://pagure.io/freeipa/issue/8932
|
||
|
|
Signed-off-by: François Cami <fcami@redhat.com>
|
||
|
|
Reviewed-By: Michal Polovka <mpolovka@redhat.com>
|
||
|
|
Reviewed-By: Armando Neto <abiagion@redhat.com>
|
||
|
|
Reviewed-By: Mohammad Rizwan <myusuf@redhat.com>
|
||
|
|
Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
|
||
|
|
---
|
||
|
|
ipatests/test_integration/test_ipa_cert_fix.py | 18 ++++--------------
|
||
|
|
1 file changed, 4 insertions(+), 14 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/ipatests/test_integration/test_ipa_cert_fix.py b/ipatests/test_integration/test_ipa_cert_fix.py
|
||
|
|
index fa69743e2..39904d5de 100644
|
||
|
|
--- a/ipatests/test_integration/test_ipa_cert_fix.py
|
||
|
|
+++ b/ipatests/test_integration/test_ipa_cert_fix.py
|
||
|
|
@@ -52,16 +52,6 @@ def check_status(host, cert_count, state, timeout=600):
|
||
|
|
return count
|
||
|
|
|
||
|
|
|
||
|
|
-def move_date(host, chrony_state, date_str):
|
||
|
|
- """Helper method to move the date on given host
|
||
|
|
- :param host: The host on which date is to be moved
|
||
|
|
- :param chrony_state: State to which chrony service to be moved
|
||
|
|
- :param date_str: date string to move the date i.e 2years1month1days
|
||
|
|
- """
|
||
|
|
- host.run_command(['systemctl', chrony_state, 'chronyd'])
|
||
|
|
- host.run_command(['date', '-s', date_str])
|
||
|
|
-
|
||
|
|
-
|
||
|
|
def needs_resubmit(host, req_id):
|
||
|
|
"""Helper method to identify if cert request needs to be resubmitted
|
||
|
|
:param host: the host
|
||
|
|
@@ -123,13 +113,13 @@ def expire_cert_critical():
|
||
|
|
tasks.install_kra(host)
|
||
|
|
|
||
|
|
# move date to expire certs
|
||
|
|
- move_date(host, 'stop', '+3Years+1day')
|
||
|
|
+ tasks.move_date(host, 'stop', '+3Years+1day')
|
||
|
|
|
||
|
|
yield _expire_cert_critical
|
||
|
|
|
||
|
|
host = hosts.pop('host')
|
||
|
|
tasks.uninstall_master(host)
|
||
|
|
- move_date(host, 'start', '-3Years-1day')
|
||
|
|
+ tasks.move_date(host, 'start', '-3Years-1day')
|
||
|
|
|
||
|
|
|
||
|
|
class TestIpaCertFix(IntegrationTest):
|
||
|
|
@@ -143,12 +133,12 @@ class TestIpaCertFix(IntegrationTest):
|
||
|
|
def expire_ca_cert(self):
|
||
|
|
tasks.install_master(self.master, setup_dns=False,
|
||
|
|
extra_args=['--no-ntp'])
|
||
|
|
- move_date(self.master, 'stop', '+20Years+1day')
|
||
|
|
+ tasks.move_date(self.master, 'stop', '+20Years+1day')
|
||
|
|
|
||
|
|
yield
|
||
|
|
|
||
|
|
tasks.uninstall_master(self.master)
|
||
|
|
- move_date(self.master, 'start', '-20Years-1day')
|
||
|
|
+ tasks.move_date(self.master, 'start', '-20Years-1day')
|
||
|
|
|
||
|
|
def test_missing_csr(self, expire_cert_critical):
|
||
|
|
"""
|
||
|
|
--
|
||
|
|
2.31.1
|
||
|
|
|