From 45f96a0f978dfda0e2faa8360182a1dfd3122b94 Mon Sep 17 00:00:00 2001 From: Florence Blanc-Renaud Date: Fri, 10 Jan 2025 13:22:29 +0100 Subject: [PATCH] ipatests: skip test_ipahealthcheck_ds_configcheck for recent versions 389-ds removed the parameter nsslapd-logging-hr-timestamps-enabled in 2.5.3 and above. Skip the test that exercises the corresponding healthcheck. Fixes: https://pagure.io/freeipa/issue/9730 Signed-off-by: Florence Blanc-Renaud Reviewed-By: Rob Crittenden Reviewed-By: Rob Crittenden --- ipatests/test_integration/test_ipahealthcheck.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ipatests/test_integration/test_ipahealthcheck.py b/ipatests/test_integration/test_ipahealthcheck.py index cc51a5a6a62fbc50927fc2fc51f129a069e70b69..6b6f15aa433a423fe599118d2226e4c4ec62b13b 100644 --- a/ipatests/test_integration/test_ipahealthcheck.py +++ b/ipatests/test_integration/test_ipahealthcheck.py @@ -18,7 +18,7 @@ import uuid import pytest -from ipalib import x509 +from ipalib import errors, x509 from ipapython.dn import DN from ipapython.ipaldap import realm_to_serverid from ipapython.certdb import NSS_SQL_FILES @@ -1146,8 +1146,14 @@ class TestIpaHealthCheck(IntegrationTest): ) entry = ldap.get_entry(dn) entry.single_value["nsslapd-logging-hr-timestamps-enabled"] = 'off' - ldap.update_entry(entry) - + try: + ldap.update_entry(entry) + except errors.DatabaseError as e: + expected_msg = "Unknown attribute " \ + "nsslapd-logging-hr-timestamps-enabled" + if expected_msg in e.message: + pytest.skip( + "389-ds removed nsslapd-logging-hr-timestamps-enabled") yield entry = ldap.get_entry(dn) -- 2.47.1