From 685d410eca0e64c7fe2f0b5ff0e8aaf9e27d9144 Mon Sep 17 00:00:00 2001
From: pgamba <pgamba@localhost>
Date: Fri, 11 Dec 2009 15:26:13 +0000
Subject: [PATCH] Improve error msg adding a usable cookie when a domain has been removed or ECL disabled
---
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 748101b..7332768 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
@@ -1152,9 +1152,10 @@
waitOpResult(searchOp, ResultCode.UNWILLING_TO_PERFORM);
assertEquals(searchOp.getSearchEntries().size(), 0);
assertTrue(searchOp.getErrorMessage().toString().startsWith(
- "Full resync required. Reason: The provided cookie contains unknown replicated domain {o=test6=}"),
+ "Full resync required. Reason: The provided cookie contains unknown replicated domain {o=test6=}. Possible cookie: <"),
searchOp.getErrorMessage().toString());
-
+ // The cookie value is not tested because it is build from a hashmap in
+ // the server and the order of domains is not predictable.
// Test missing domain in provided cookie
newCookie = lastCookie.substring(lastCookie.indexOf(';')+1);
control =
@@ -1178,8 +1179,8 @@
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:" +
+ "Full resync required. Reason: The provided cookie is missing the replicated domain(s) o=test:;. Possible cookie: <"
+ + newCookie + "o=test:;>"), "Server output:" +
searchOp.getErrorMessage().toString());
s1test.stop();
--
Gitblit v1.10.0