From fe4c8ab9a1c15ab0965d235bb9eccbf587cfc93e Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Fri, 06 Jul 2007 07:06:10 +0000
Subject: [PATCH] fix for 1898 : Conflicts between moddn and del generate server errors
---
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java
index c93ae7f..bee8e73 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java
@@ -1089,6 +1089,23 @@
// check that unresolved conflict count has been incremented
assertEquals(getMonitorDelta(), 1);
+ // Check that when an entry is deleted on a first master and
+ // renamed on a second master and the rename is replayed last
+ // this is correctly detected as a resolved conflict.
+ // To simulate this simply try a modifyDN on a non existent uid.
+ modDnMsg = new ModifyDNMsg(
+ "uid=new person,ou=People,dc=example,dc=com", gen.newChangeNumber(),
+ "33343333-3533-3633-3373-333333833333", baseUUID, false,
+ "uid=wrong, ou=people,dc=example,dc=com",
+ "uid=newrdn");
+ updateMonitorCount(baseDn, resolvedMonitorAttr);
+ broker.publish(modDnMsg);
+ // unfortunately it is difficult to check that the operation
+ // did not do anything.
+ // The only thing we can check is that resolved naminf conflict counter
+ // has correctly been incremented.
+ assertEquals(getMonitorDelta(), 1);
+
broker.stop();
}
--
Gitblit v1.10.0