From 617f7824ca56c040bd5c5ad60dc23f228df70b63 Mon Sep 17 00:00:00 2001 From: Sudhir Menon Date: Wed, 4 Nov 2020 17:09:23 +0530 Subject: [PATCH] Added nsslapd-logging-hr-timestamps-enabled attribute in _SINGLE_VALUE_OVERRIDE table In ipa-healthcheck ds-related tests i.e test_ipahealthcheck.py::TestIpaHealthCheck::test_ipahealthcheck_ds_configcheck there exists a scenario of modifying the "nsslapd-logging-hr-timestamps-enabled" attribute to off The tests are failing with the below error "ipalib.errors.MidairCollision: change collided with another change" The test audit log displays that the attribute is deleted first and then added. changetype: modify delete: nsslapd-logging-hr-timestamps-enabled nsslapd-logging-hr-timestamps-enabled: on - add: nsslapd-logging-hr-timestamps-enabled nsslapd-logging-hr-timestamps-enabled: off Adding the nsslapd-logging-hr-timestamps-enabled attribute in _SINGLE_VALUE_OVERRIDE table to check if we generate a replace instead of add and delete. Signed-off-by: Sudhir Menon Reviewed-By: Florence Blanc-Renaud Reviewed-By: Rob Crittenden --- ipapython/ipaldap.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ipapython/ipaldap.py b/ipapython/ipaldap.py index 42f41ae8a..394cd92e4 100644 --- a/ipapython/ipaldap.py +++ b/ipapython/ipaldap.py @@ -760,6 +760,7 @@ class LDAPClient: 'nsslapd-minssf-exclude-rootdse': True, 'nsslapd-enable-upgrade-hash': True, 'nsslapd-db-locks': True, + 'nsslapd-logging-hr-timestamps-enabled': True, }) time_limit = -1.0 # unlimited