82 lines
3.3 KiB
Diff
82 lines
3.3 KiB
Diff
|
From 86869364a30f071ee79974b301ff68e80c0950ba Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Fran=C3=A7ois=20Cami?= <fcami@redhat.com>
|
||
|
|
Date: Tue, 20 Jul 2021 20:19:16 +0200
|
||
|
|
Subject: [PATCH] test_acme: refactor with tasks
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Signed-off-by: François Cami <fcami@redhat.com>
|
||
|
|
Reviewed-By: Michal Polovka <mpolovka@redhat.com>
|
||
|
|
---
|
||
|
|
ipatests/pytest_ipa/integration/tasks.py | 11 +++++++++++
|
||
|
|
ipatests/test_integration/test_acme.py | 19 ++++---------------
|
||
|
|
2 files changed, 15 insertions(+), 15 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/ipatests/pytest_ipa/integration/tasks.py b/ipatests/pytest_ipa/integration/tasks.py
|
||
|
|
index 22c7ba782..c2e548617 100755
|
||
|
|
--- a/ipatests/pytest_ipa/integration/tasks.py
|
||
|
|
+++ b/ipatests/pytest_ipa/integration/tasks.py
|
||
|
|
@@ -2800,3 +2800,14 @@ def is_package_installed(host, pkg):
|
||
|
|
'is_package_installed: unknown platform %s' % platform
|
||
|
|
)
|
||
|
|
return result.returncode == 0
|
||
|
|
+
|
||
|
|
+
|
||
|
|
+def move_date(host, chrony_cmd, date_str):
|
||
|
|
+ """Helper method to move system date
|
||
|
|
+ :param host: host on which date is to be manipulated
|
||
|
|
+ :param chrony_cmd: systemctl command to apply to
|
||
|
|
+ chrony service, for instance 'start', 'stop'
|
||
|
|
+ :param date_str: date string to change the date i.e '3years2months1day1'
|
||
|
|
+ """
|
||
|
|
+ host.run_command(['systemctl', chrony_cmd, 'chronyd'])
|
||
|
|
+ host.run_command(['date', '-s', date_str])
|
||
|
|
diff --git a/ipatests/test_integration/test_acme.py b/ipatests/test_integration/test_acme.py
|
||
|
|
index d90f1ff7d..b4aa1b351 100644
|
||
|
|
--- a/ipatests/test_integration/test_acme.py
|
||
|
|
+++ b/ipatests/test_integration/test_acme.py
|
||
|
|
@@ -35,17 +35,6 @@ skip_mod_md_tests = osinfo.id not in ['rhel', 'fedora', ]
|
||
|
|
CERTBOT_DNS_IPA_SCRIPT = '/usr/libexec/ipa/acme/certbot-dns-ipa'
|
||
|
|
|
||
|
|
|
||
|
|
-def move_date(host, chrony_cmd, date_str):
|
||
|
|
- """Helper method to move system date
|
||
|
|
- :param host: host on which date is to be manipulated
|
||
|
|
- :param chrony_cmd: systemctl command to apply to
|
||
|
|
- chrony service, for instance 'start', 'stop'
|
||
|
|
- :param date_str: date string to change the date i.e '3years2months1day1'
|
||
|
|
- """
|
||
|
|
- host.run_command(['systemctl', chrony_cmd, 'chronyd'])
|
||
|
|
- host.run_command(['date', '-s', date_str])
|
||
|
|
-
|
||
|
|
-
|
||
|
|
def check_acme_status(host, exp_status, timeout=60):
|
||
|
|
"""Helper method to check the status of acme server"""
|
||
|
|
for _i in range(0, timeout, 5):
|
||
|
|
@@ -598,8 +587,8 @@ class TestACMERenew(IntegrationTest):
|
||
|
|
)
|
||
|
|
# move system date to expire acme cert
|
||
|
|
for host in self.clients[0], self.master:
|
||
|
|
- host.run_command(['kdestroy', '-A'])
|
||
|
|
- move_date(host, 'stop', '+90days')
|
||
|
|
+ tasks.kdestroy_all(host)
|
||
|
|
+ tasks.move_date(host, 'stop', '+90days')
|
||
|
|
self.clients[0].run_command(
|
||
|
|
['kinit', 'admin'],
|
||
|
|
stdin_text=cmd_input.format(
|
||
|
|
@@ -611,8 +600,8 @@ class TestACMERenew(IntegrationTest):
|
||
|
|
|
||
|
|
# move back date
|
||
|
|
for host in self.clients[0], self.master:
|
||
|
|
- host.run_command(['kdestroy', '-A'])
|
||
|
|
- move_date(host, 'start', '-90days')
|
||
|
|
+ tasks.kdestroy_all(host)
|
||
|
|
+ tasks.move_date(host, 'start', '-90days')
|
||
|
|
tasks.kinit_admin(host)
|
||
|
|
|
||
|
|
@pytest.mark.skipif(skip_certbot_tests, reason='certbot not available')
|
||
|
|
--
|
||
|
|
2.31.1
|
||
|
|
|