From 2d1140ba12ff130c34642b2a0bd4593ada3db11e Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 01 Apr 2014 09:50:13 +0000
Subject: [PATCH] Trying to fix test failing every night.
---
opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java
index bd8a617..385d0b0 100644
--- a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java
+++ b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java
@@ -33,6 +33,7 @@
import org.assertj.core.api.Assertions;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
import org.opends.server.TestCaseUtils;
import org.opends.server.backends.MemoryBackend;
@@ -50,7 +51,6 @@
import org.opends.server.replication.service.ReplicationBroker;
import org.opends.server.tasks.LdifFileWriter;
import org.opends.server.types.*;
-import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@@ -555,20 +555,20 @@
* Check that the expected number of changes are in the replication server
* database.
*/
- private void checkChangelogSize(int expectedCount, int timeout) throws Exception
+ private void checkChangelogSize(int expectedCount) throws Exception
{
- long start = System.currentTimeMillis();
- InternalSearchOperation searchOperation;
+ int count = 0;
+ InternalSearchOperation op;
do
{
Thread.sleep(10);
- searchOperation = connection.processSearch(
+ op = connection.processSearch(
"dc=replicationchanges", SearchScope.SUBORDINATES, "(objectclass=*)");
}
- while (System.currentTimeMillis() - start <= timeout
- && searchOperation.getResultCode() != ResultCode.SUCCESS
- && searchOperation.getSearchEntries().size() != expectedCount);
- Assertions.assertThat(searchOperation.getSearchEntries()).hasSize(expectedCount);
+ while (count < 300 // wait 3s maximum
+ && op.getResultCode() != ResultCode.SUCCESS
+ && op.getSearchEntries().size() != expectedCount);
+ Assertions.assertThat(op.getSearchEntries()).hasSize(expectedCount);
}
/**
@@ -660,7 +660,7 @@
addTestEntriesToDB(createEntry(UUID.randomUUID()));
// Verify that RS1 does contain the change related to this ADD.
- checkChangelogSize(1, 500);
+ checkChangelogSize(1);
// Verify that DS3 receives this change
ReplicationMsg msg = broker3.receive();
@@ -698,7 +698,7 @@
// By the way also verify that no change occurred on the replication server db
// and still contain the ADD submitted initially.
- checkChangelogSize(1, 500);
+ checkChangelogSize(1);
//===============================================================
debugInfo(testCase + " ** TEST ** Import with new data set + reset will"+
@@ -747,7 +747,7 @@
assertEquals(dsGenId, rsGenId, "DS and replServer are expected to have same genId.");
debugInfo("RS1 must have been cleared since it has not the proper generation ID");
- checkChangelogSize(0, 0);
+ checkChangelogSize(0);
assertFalse(isDegradedDueToGenerationId(replServer1, server1ID),
"Expecting that DS1 status in RS1 is : not in bad gen id.");
@@ -766,7 +766,7 @@
addTestEntriesToDB(createEntry(UUID.randomUUID()));
debugInfo("RS1 must have stored that update.");
- checkChangelogSize(1, 500);
+ checkChangelogSize(1);
assertNoMessageReceived(broker2, "broker2", "bad gen id");
assertNoMessageReceived(broker3, "broker3", "bad gen id");
@@ -776,7 +776,7 @@
broker2.publish(emsg);
// Updates count in RS1 must stay unchanged = to 1
- checkChangelogSize(1, 500);
+ checkChangelogSize(1);
assertNoMessageReceived(broker3, "broker3", "bad gen id");
@@ -814,7 +814,7 @@
assertEquals(replServer1.getGenerationId(baseDN), rsGenId);
// Updates count in RS1 must stay unchanged = to 1
- checkChangelogSize(1, 500);
+ checkChangelogSize(1);
debugInfo("Verifying that DS2 is not in bad gen id any more");
assertFalse(isDegradedDueToGenerationId(replServer1, server2ID),
@@ -836,7 +836,7 @@
final AddMsg emsg2 = createAddMsg();
broker2.publish(emsg2);
- checkChangelogSize(2, 500);
+ checkChangelogSize(2);
/* expected */
msg = broker3.receive();
@@ -913,7 +913,7 @@
* - genId reset propagation from one RS to the others
*/
@Test(enabled=false)
- public void testMultiRS(int i) throws Exception
+ public void testMultiRS() throws Exception
{
String testCase = "testMultiRS";
long genId;
@@ -1138,7 +1138,7 @@
public void generationIdTest() throws Exception
{
testSingleRS();
- testMultiRS(0);
+ testMultiRS();
testServerStop();
testLoop();
}
--
Gitblit v1.10.0