From 62fa71ffa654fb8afcf6018af7cafd91013104fe Mon Sep 17 00:00:00 2001
From: Ludwig Krispenz <lkrispen@redhat.com>
Date: Mon, 5 Mar 2018 12:35:03 +0100
Subject: [PATCH] change deadlock resolving policy

---
 dirsrvtests/tests/suites/replication/conflict_resolve_test.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dirsrvtests/tests/suites/replication/conflict_resolve_test.py b/dirsrvtests/tests/suites/replication/conflict_resolve_test.py
index 9f53604..8b77543 100644
--- a/dirsrvtests/tests/suites/replication/conflict_resolve_test.py
+++ b/dirsrvtests/tests/suites/replication/conflict_resolve_test.py
@@ -19,6 +19,7 @@ from lib389.idm.organisationalunit import OrganisationalUnits
 from lib389.replica import ReplicationManager
 from lib389.agreement import Agreements
 from lib389.plugins import MemberOfPlugin
+from lib389.config import LDBMConfig
 
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
@@ -121,6 +122,8 @@ def _test_base(topology):
         inst.config.loglevel([AccessLog.DEFAULT, AccessLog.INTERNAL], service='access')
         inst.config.set('nsslapd-plugin-logging', 'on')
         inst.config.enable_log('audit')
+        ldbmconfig = LDBMConfig(inst)
+        ldbmconfig.replace('nsslapd-db-deadlock-policy', '6')
         inst.restart()
 
     return test_base
-- 
2.9.5