|
 |
7e1b55 |
From 96dd8ac1cd2e7fb8177d83e7ba5c6d79f4216ea3 Mon Sep 17 00:00:00 2001
|
|
|
7e1b55 |
From: Mohammad Rizwan <myusuf@redhat.com>
|
|
|
7e1b55 |
Date: Mon, 2 Aug 2021 19:26:28 +0530
|
|
|
7e1b55 |
Subject: [PATCH] ipatests: Look for warning into stderr instead of stdout
|
|
|
7e1b55 |
|
|
|
7e1b55 |
In https://github.com/freeipa/freeipa/pull/5855 was looking
|
|
|
7e1b55 |
into stdout_text for warning instead of stderr_text, hence
|
|
|
7e1b55 |
was failing for pki version > 10.11.0.
|
|
|
7e1b55 |
|
|
|
7e1b55 |
related: https://pagure.io/freeipa/issue/8890
|
|
|
7e1b55 |
|
|
|
7e1b55 |
Signed-off-by: Mohammad Rizwan <myusuf@redhat.com>
|
|
|
7e1b55 |
Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
|
|
|
7e1b55 |
---
|
|
|
7e1b55 |
ipatests/test_integration/test_ipa_cert_fix.py | 6 ++----
|
|
|
7e1b55 |
1 file changed, 2 insertions(+), 4 deletions(-)
|
|
|
7e1b55 |
|
|
|
7e1b55 |
diff --git a/ipatests/test_integration/test_ipa_cert_fix.py b/ipatests/test_integration/test_ipa_cert_fix.py
|
|
|
7e1b55 |
index 394e85603..f3cf59afc 100644
|
|
|
7e1b55 |
--- a/ipatests/test_integration/test_ipa_cert_fix.py
|
|
|
7e1b55 |
+++ b/ipatests/test_integration/test_ipa_cert_fix.py
|
|
|
7e1b55 |
@@ -241,16 +241,14 @@ class TestIpaCertFix(IntegrationTest):
|
|
|
7e1b55 |
# check that pki-server cert-fix command fails
|
|
|
7e1b55 |
err_msg2 = ("ERROR: CalledProcessError(Command "
|
|
|
7e1b55 |
"['pki-server', 'cert-fix'")
|
|
|
7e1b55 |
- warn_msg = ("WARNING: No selftests configured in "
|
|
|
7e1b55 |
- f"{paths.CA_CS_CFG_PATH} "
|
|
|
7e1b55 |
- "(selftests.container.order.startup)")
|
|
|
7e1b55 |
+ warn_msg = "WARNING: No selftests configured in"
|
|
|
7e1b55 |
|
|
|
7e1b55 |
if (tasks.get_pki_version(self.master)
|
|
|
7e1b55 |
< tasks.parse_version('10.11.0')):
|
|
|
7e1b55 |
assert (err_msg1 in result.stderr_text
|
|
|
7e1b55 |
and err_msg2 in result.stderr_text)
|
|
|
7e1b55 |
else:
|
|
|
7e1b55 |
- assert warn_msg in result.stdout_text
|
|
|
7e1b55 |
+ assert warn_msg in result.stderr_text
|
|
|
7e1b55 |
|
|
|
7e1b55 |
def test_expired_CA_cert(self, expire_ca_cert):
|
|
|
7e1b55 |
"""Test to check ipa-cert-fix when CA certificate is expired
|
|
|
7e1b55 |
--
|
|
|
7e1b55 |
2.31.1
|
|
|
7e1b55 |
|