From 058f073a3cdbe9b6d1f6733ed0e51289603b67e9 Mon Sep 17 00:00:00 2001
From: Valery Kharseko <vharseko@3a-systems.ru>
Date: Tue, 25 Aug 2026 08:09:07 +0000
Subject: [PATCH] Wait for the renamed entry before reading the naming conflict monitor (#895)
---
opendj-server-legacy/src/test/java/org/opends/server/replication/UpdateOperationTest.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/UpdateOperationTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/UpdateOperationTest.java
index d973d2d..4c9dde1 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/UpdateOperationTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/UpdateOperationTest.java
@@ -729,7 +729,11 @@
assertNull(getEntry(personWithUUIDEntry.getName(), 10000, false),
"The DELETE replication message was not replayed");
- assertNull(getEntry(personWithSecondUniqueID.getName(), 10000, false),
+ // The second entry was created with the same DN as the first one, so waiting
+ // on that DN again returns as soon as the first delete is replayed. Wait on
+ // the DN the naming conflict renamed it to instead: the second delete then
+ // has resolved its conflict, and counted it, before the monitor is read below.
+ assertNull(getEntry(dn2, 10000, false),
"The DELETE replication message was not replayed");
/*
* Check that and added entry is correctly added below it's
--
Gitblit v1.10.0