From 3229ddd0bfacb4e49a48275dce3befb1aab0a535 Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Thu, 08 Mar 2007 10:41:00 +0000
Subject: [PATCH] Fix some synchronization tests so that they don't fail anymore when trying to add an entry that already exist.
---
opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/StressTest.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/StressTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/StressTest.java
index 2c4075d..c21c8e6 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/StressTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/StressTest.java
@@ -32,12 +32,14 @@
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
+import java.net.SocketTimeoutException;
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
import org.opends.server.TestCaseUtils;
+import org.opends.server.TestErrorLogger;
import org.opends.server.api.MonitorProvider;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
@@ -131,19 +133,22 @@
entryList.add(personEntry.getDN());
assertTrue(DirectoryServer.entryExists(personEntry.getDN()),
"The Add Entry operation failed");
+ if (ResultCode.SUCCESS == addOp.getResultCode())
+ {
+ // Check if the client has received the msg
+ SynchronizationMessage msg = broker.receive();
- // Check if the client has received the msg
- SynchronizationMessage msg = broker.receive();
- assertTrue(msg instanceof AddMsg,
+ assertTrue(msg instanceof AddMsg,
"The received synchronization message is not an ADD msg");
- AddMsg addMsg = (AddMsg) msg;
+ AddMsg addMsg = (AddMsg) msg;
- Operation receivedOp = addMsg.createOperation(connection);
- assertTrue(OperationType.ADD.compareTo(receivedOp.getOperationType()) == 0,
+ Operation receivedOp = addMsg.createOperation(connection);
+ assertTrue(OperationType.ADD.compareTo(receivedOp.getOperationType()) == 0,
"The received synchronization message is not an ADD msg");
- assertEquals(DN.decode(addMsg.getDn()),personEntry.getDN(),
+ assertEquals(DN.decode(addMsg.getDn()),personEntry.getDN(),
"The received ADD synchronization message is not for the excepted DN");
+ }
reader = new BrokerReader(broker);
reader.start();
--
Gitblit v1.10.0