From d0f661e460e13c4fc036ee9a97c04fcadcc94766 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Tue, 23 Sep 2014 14:34:40 +0000
Subject: [PATCH] Attemp to fix random test in HistoricalTest class
---
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalTest.java | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalTest.java
index e7bc708..a6fa29a 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalTest.java
@@ -30,14 +30,10 @@
import java.util.List;
import java.util.UUID;
-import org.assertj.core.api.Assertions;
import org.forgerock.opendj.ldap.ModificationType;
-import org.forgerock.opendj.ldap.ResultCode;
-import org.forgerock.opendj.ldap.SearchScope;
import org.opends.server.TestCaseUtils;
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.internal.InternalClientConnection;
-import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.replication.ReplicationTestCase;
import org.opends.server.replication.common.CSN;
import org.opends.server.replication.protocol.AddMsg;
@@ -49,6 +45,8 @@
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
+import static org.forgerock.opendj.ldap.ResultCode.*;
+import static org.forgerock.opendj.ldap.SearchScope.*;
import static org.opends.server.TestCaseUtils.*;
import static org.testng.Assert.*;
@@ -489,9 +487,8 @@
@Test(enabled=true)
public void testRecurringPurgeIn1Run() throws Exception
{
- int entryCnt = 10;
-
- addEntriesWithHistorical(1, entryCnt);
+ int entryCount = 10;
+ addEntriesWithHistorical(1, entryCount);
// leave a little delay between adding/modifying test entries
// and configuring the purge delay.
Thread.sleep(10);
@@ -503,7 +500,7 @@
TestCaseUtils.dsconfig(
"set-replication-domain-prop",
"--provider-name","Multimaster Synchronization",
- "--domain-name",testName,
+ "--domain-name", testName,
"--set","conflicts-historical-purge-delay:1m");
// Let's go past the purge delay
@@ -522,11 +519,8 @@
executeTask(purgeConflictsHistoricalTask, maxWaitTimeInSeconds * 1000);
// every entry should be purged from its hist
- // Search for matching entries in config backend
- InternalSearchOperation op = connection.processSearch(
- TEST_ROOT_DN_STRING, SearchScope.WHOLE_SUBTREE, "(ds-sync-hist=*)");
- assertEquals(op.getResultCode(), ResultCode.SUCCESS, op.getErrorMessage().toString());
- Assertions.assertThat(op.getSearchEntries()).isEmpty();
+ int expectedNumberOfEntries = 0;
+ waitForSearchResult(TEST_ROOT_DN_STRING, WHOLE_SUBTREE, "(ds-sync-hist=*)", SUCCESS, expectedNumberOfEntries);
}
/**
--
Gitblit v1.10.0