IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

test_acme: refactor with tasks

Browse Source 
Signed-off-by: François Cami <fcami@redhat.com>
Reviewed-By: Michal Polovka <mpolovka@redhat.com>
This commit is contained in:
François Cami 2021-07-20 20:19:16 +02:00
parent 4618c3c24a
commit 82ab9245a5
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ipatests/pytest_ipa/integration/tasks.py
View File

@ -2802,3 +2802,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])

19
ipatests/test_integration/test_acme.py
View File

@ -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')