From ea16c22c6b725367e499b31054497246b67ca703 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 11 Oct 2013 14:29:15 +0000
Subject: [PATCH] Trying to fix random failures for HistoricalTest.testRecurringPurgeIn1Run().
---
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java | 30 ++++++++++++------------------
1 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
index 0a3040d..1327987 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
@@ -56,6 +56,7 @@
import static org.opends.messages.ReplicationMessages.*;
import static org.opends.messages.TaskMessages.*;
+import static org.opends.server.backends.task.TaskState.*;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
@@ -680,8 +681,7 @@
// Tests that entries have been received by S2
receiveUpdatedEntries(server2);
- // Wait for task completion
- waitTaskState(taskInitTargetS2, TaskState.COMPLETED_SUCCESSFULLY, null);
+ waitTaskState(taskInitTargetS2, COMPLETED_SUCCESSFULLY, 20000, null);
log("Successfully ending " + testCase);
} finally
@@ -738,8 +738,7 @@
receiveUpdatedEntries(server2);
receiveUpdatedEntries(server3);
- // Wait for task completion
- waitTaskState(taskInitTargetAll, TaskState.COMPLETED_SUCCESSFULLY, null);
+ waitTaskState(taskInitTargetAll, COMPLETED_SUCCESSFULLY, 20000, null);
log("Successfully ending " + testCase);
} finally
@@ -1028,9 +1027,7 @@
log(testCase + " receive entries");
receiveUpdatedEntries(server2);
- // Wait for task completion
- log(testCase + " wait task completed");
- waitTaskState(taskInitTargetS2, TaskState.COMPLETED_SUCCESSFULLY, null);
+ waitTaskState(taskInitTargetS2, COMPLETED_SUCCESSFULLY, 20000, null);
log("Successfully ending " + testCase);
}
@@ -1138,8 +1135,7 @@
"ds-task-initialize-replica-server-id: " + 20);
addTask(taskInit, ResultCode.SUCCESS, null);
-
- waitTaskState(taskInit, TaskState.STOPPED_BY_ERROR,
+ waitTaskState(taskInit, TaskState.STOPPED_BY_ERROR, 20000,
ERR_NO_REACHABLE_PEER_IN_THE_DOMAIN.get(baseDN.toString(), "20"));
// Test 2
@@ -1195,9 +1191,8 @@
"ds-task-initialize-replica-server-id: " + 0);
addTask(taskInit, ResultCode.SUCCESS, null);
-
- waitTaskState(taskInit, TaskState.STOPPED_BY_ERROR,
- ERR_NO_REACHABLE_PEER_IN_THE_DOMAIN.get(baseDN.toString(), "0"));
+ waitTaskState(taskInit, TaskState.STOPPED_BY_ERROR, 20000,
+ ERR_NO_REACHABLE_PEER_IN_THE_DOMAIN.get(baseDN.toString(), "0"));
if (replDomain != null)
{
@@ -1285,12 +1280,11 @@
// Second task is expected to be rejected
addTask(taskInit2, ResultCode.SUCCESS, null);
+ waitTaskState(taskInit2, STOPPED_BY_ERROR, 20000,
+ ERR_SIMULTANEOUS_IMPORT_EXPORT_REJECTED.get());
- waitTaskState(taskInit2, TaskState.STOPPED_BY_ERROR,
- ERR_SIMULTANEOUS_IMPORT_EXPORT_REJECTED.get());
-
- // First task is stilll running
- waitTaskState(taskInit, TaskState.RUNNING, null);
+ // First task is still running
+ waitTaskState(taskInit, RUNNING, 20000, null);
// External request is supposed to be rejected
@@ -1299,7 +1293,7 @@
ErrorMsg msg = new ErrorMsg(server1ID, 1, Message.EMPTY);
server2.publish(msg);
- waitTaskState(taskInit, TaskState.STOPPED_BY_ERROR, null);
+ waitTaskState(taskInit, STOPPED_BY_ERROR, 20000, null);
log("Successfully ending " + testCase);
} finally
--
Gitblit v1.10.0