From 4365a9913ca5f7d3c1fccd53f4b20642f6be7b30 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 17 Oct 2013 12:54:56 +0000
Subject: [PATCH] GenerationIdTest.generationIdTest() test is not fixed, but I have now determined that it is failing because the server is not connected to a replication domain, hence it is impossible to add the changes to the changelog.
---
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java
index 6eb81d6..f5ccd53 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java
@@ -43,6 +43,7 @@
import org.opends.server.replication.common.CSNGenerator;
import org.opends.server.replication.common.ServerStatus;
import org.opends.server.replication.plugin.LDAPReplicationDomain;
+import org.opends.server.replication.plugin.MultimasterReplication;
import org.opends.server.replication.protocol.*;
import org.opends.server.replication.server.ReplServerFakeConfiguration;
import org.opends.server.replication.server.ReplicationBackend;
@@ -151,7 +152,7 @@
private void debugInfo(String message, Exception e)
{
- debugInfo(message + stackTraceToSingleLineString(e));
+ debugInfo(message + " " + stackTraceToSingleLineString(e));
}
/**
@@ -443,7 +444,7 @@
catch (DirectoryException e)
{
// success
- debugInfo("disconnectFromReplServer:" + rs.getServerId(), e);
+ debugInfo("disconnectFromReplServer: " + rs.getServerId(), e);
}
}
}
@@ -659,6 +660,7 @@
debugInfo(testCase + " ** TEST ** The part of the topology with the right gen ID should work well");
// Now create a change that must be replicated
+ assertConnectedToReplicationDomain();
addTestEntriesToDB(createEntry(UUID.randomUUID()));
// Verify that RS1 does contain the change related to this ADD.
@@ -764,6 +766,7 @@
"Expecting that DS3 with old gen ID is in bad gen id from RS1");
debugInfo("Add entries to DS1, update should not be sent to DS2 and DS3 that are in bad gen id");
+ assertConnectedToReplicationDomain();
addTestEntriesToDB(createEntry(UUID.randomUUID()));
debugInfo("RS1 must have stored that update.");
@@ -858,6 +861,13 @@
}
}
+ private void assertConnectedToReplicationDomain()
+ {
+ assertTrue(MultimasterReplication.findDomain(baseDN, null).isConnected(),
+ "The server should be connected to replication domain" + baseDN
+ + " at this point");
+ }
+
private Entry createSetGenerationIdTask(Long genId, String additionalAttribute) throws Exception
{
String genIdString = genId != null ? genId.toString() : "";
@@ -1055,6 +1065,7 @@
assertEquals(readGenIdFromSuffixRootEntry(), -1,
"genId attribute should not be retrievable since there are NO entry in the backend");
+ assertConnectedToReplicationDomain();
addTestEntriesToDB(updatedEntries);
assertEquals(readGenIdFromSuffixRootEntry(), EMPTY_DN_GENID,
"genId attribute should be retrievable since there IS one entry in the backend");
--
Gitblit v1.10.0