From 85717dba310bd49cffd4366162f9d37885d3cf89 Mon Sep 17 00:00:00 2001
From: Gary Williams <gary.williams@forgerock.com>
Date: Thu, 22 Mar 2012 16:14:33 +0000
Subject: [PATCH] More cleanup of known issues in replication functional tests

---
 opends/tests/staf-tests/functional-tests/testcases/replication/basic/basic.xml       |    9 ++-------
 opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict.xml |   10 +++++-----
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/opends/tests/staf-tests/functional-tests/testcases/replication/basic/basic.xml b/opends/tests/staf-tests/functional-tests/testcases/replication/basic/basic.xml
index 40f2627..c6abd8c 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/replication/basic/basic.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/replication/basic/basic.xml
@@ -24,7 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2007-2010 Sun Microsystems, Inc.
- !      Portions Copyright 2011 ForgeRock AS.
+ !      Portions Copyright 2011-2012 ForgeRock AS.
  ! -->
 <stax>
 
@@ -2036,13 +2036,8 @@
                 
               <!-- Verify the synchronization of the trees among the servers in 
                 the topology -->          
-              <!-- If tree verification fails, we may have come across known
-               !   issue CR 6925675: Removing suffix root entry brings 
-               !   generation ID loss
-              -->
               <call function="'verifyTrees'">
-                [ clientHost, clientPath, master, consumerList, synchroSuffix,
-                  '6925675' ]
+                [ clientHost, clientPath, master, consumerList, synchroSuffix ]
               </call>
 
               <call function="'testCase_Postamble'"/>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict.xml b/opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict.xml
index 64457b5..66ec322 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict.xml
@@ -24,7 +24,7 @@
  ! CDDL HEADER END
  !
  !      Portions Copyright 2006-2009 Sun Microsystems, Inc.
- !      Portions Copyright 2011 ForgeRock AS.
+ !      Portions Copyright 2011-2012 ForgeRock AS.
  ! -->
 <stax>
 
@@ -3241,12 +3241,12 @@
 
               <!-- Verify the synchronization of the trees among the servers in 
                 the topology -->
-              <!-- If the trees don't match, we may have come across Issue 3401
+              <!-- If the trees don't match, we may have come across Issue OPENDJ-454
                (RFE: Solve naming conflict of 2 adds with same dn, different
                attr value) -->
               <call function="'verifyTrees'">
                 [ clientHost, clientPath, server1, [server2], synchroSuffix,
-                  '3401' ]
+                  'OPENDJ-454' ]
               </call> 
 
               <!-- Delete added entries -->
@@ -3502,12 +3502,12 @@
 
               <!-- Verify the synchronization of the trees among the servers in 
                 the topology -->
-              <!-- If the trees don't match, we may have come across Issue 3401
+              <!-- If the trees don't match, we may have come across Issue OPENDJ-454
                (RFE: Solve naming conflict of 2 adds with same dn, different 
                attr value) -->
               <call function="'verifyTrees'">
                 [ clientHost, clientPath, server1, [server2], synchroSuffix,
-                  '3401' ]
+                  'OPENDJ-454' ]
               </call> 
 
               <!-- Delete added entries -->

--
Gitblit v1.10.0