71 lines
2.7 KiB
Diff
71 lines
2.7 KiB
Diff
From ff6cfcacd67a0461a0341e17854732cbe301f1d6 Mon Sep 17 00:00:00 2001
|
|
From: Mohammad Rizwan <myusuf@redhat.com>
|
|
Date: Wed, 2 Aug 2023 12:48:40 +0530
|
|
Subject: [PATCH] ipatests: remove fixture call and wait to get things settle
|
|
|
|
system date moved in order to expire the certs. Sometime it
|
|
is observed that subsequent operation fails with 500 error for CA,
|
|
hence restart the services after moving date and wait for sometime
|
|
to get things settle.
|
|
|
|
Also the tests was calling fixture which is not required for it, hence
|
|
removed it as well.
|
|
|
|
Fixes: https://pagure.io/freeipa/issue/9348
|
|
|
|
Signed-off-by: Mohammad Rizwan <myusuf@redhat.com>
|
|
Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
|
|
---
|
|
ipatests/test_integration/test_acme.py | 14 ++++++++++++--
|
|
1 file changed, 12 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/ipatests/test_integration/test_acme.py b/ipatests/test_integration/test_acme.py
|
|
index cca20983e65f99d5ba0bb7bc6dc2b5684a6f37d9..c7389732cd067d49541cd04ea6687a6b95b4669f 100644
|
|
--- a/ipatests/test_integration/test_acme.py
|
|
+++ b/ipatests/test_integration/test_acme.py
|
|
@@ -606,6 +606,11 @@ def issue_and_expire_acme_cert():
|
|
tasks.kdestroy_all(host)
|
|
tasks.move_date(host, 'stop', '+90days+60minutes')
|
|
|
|
+ # restart ipa services as date moved and wait to get things settle
|
|
+ time.sleep(10)
|
|
+ master.run_command(['ipactl', 'restart'])
|
|
+ time.sleep(10)
|
|
+
|
|
tasks.get_kdcinfo(master)
|
|
# Note raiseonerr=False:
|
|
# the assert is located after kdcinfo retrieval.
|
|
@@ -627,6 +632,11 @@ def issue_and_expire_acme_cert():
|
|
for host in hosts:
|
|
tasks.move_date(host, 'start', '-90days-60minutes')
|
|
|
|
+ # restart ipa services as date moved and wait to get things settle
|
|
+ time.sleep(10)
|
|
+ hosts[0].run_command(['ipactl', 'restart'])
|
|
+ time.sleep(10)
|
|
+
|
|
|
|
class TestACMERenew(IntegrationTest):
|
|
|
|
@@ -960,7 +970,7 @@ class TestACMEPrune(IntegrationTest):
|
|
)
|
|
assert f'Number of entries returned {no_of_cert - search_size_limit}'
|
|
|
|
- def test_prune_config_show(self, issue_and_expire_acme_cert):
|
|
+ def test_prune_config_show(self):
|
|
"""Test to check config-show command shows set param"""
|
|
if (tasks.get_pki_version(self.master)
|
|
< tasks.parse_version('11.3.0')):
|
|
@@ -1001,7 +1011,7 @@ class TestACMEPrune(IntegrationTest):
|
|
assert 'Request Search Time Limit: 0' in result.stdout_text
|
|
assert 'cron Schedule: 0 0 1 * *' in result.stdout_text
|
|
|
|
- def test_prune_disable(self, issue_and_expire_acme_cert):
|
|
+ def test_prune_disable(self):
|
|
"""Test prune command throw error after disabling the pruning"""
|
|
if (tasks.get_pki_version(self.master)
|
|
< tasks.parse_version('11.3.0')):
|
|
--
|
|
2.41.0
|
|
|