From a33166c79680cdc1154b99df37987140c9bd2e9c Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Mon, 31 May 2010 09:07:29 +0000
Subject: [PATCH] Improve error message when querying the External Changelog with an invalid cookie. Improve unit tests reliabililty  for replication. 

---
 opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ExternalChangeLogTest.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ExternalChangeLogTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ExternalChangeLogTest.java
index ade001b..a4fefed 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ExternalChangeLogTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ExternalChangeLogTest.java
@@ -1184,11 +1184,12 @@
       
       waitOpResult(searchOp, ResultCode.UNWILLING_TO_PERFORM);
       assertEquals(searchOp.getSearchEntries().size(), 0);
-      assertTrue(searchOp.getErrorMessage().toString().equalsIgnoreCase(
-          "Full resync required. Reason: The provided cookie is missing the replicated domain(s) o=test:;. Possible cookie: <" 
-          + newCookie + "o=test:;>"), "Server output:" +
+      String expectedError = 
+        "Full resync required because the provided cookie is missing the replicated domain(s) o=test:;. The following cookie value can be used to retrieve the missing changes, including the COMPLETE record of changes for the missing domain(s) : <"
+        + newCookie + "o=test:;>";
+      assertTrue(searchOp.getErrorMessage().toString().equalsIgnoreCase(expectedError),
+          "Expected: " + expectedError + "Server output:" +
           searchOp.getErrorMessage().toString());
-
       s1test.stop();
       s1test2.stop();
       s2test.stop();

--
Gitblit v1.10.0