From 0394ad77bc7f576c787ea15f27673b60ef000520 Mon Sep 17 00:00:00 2001
From: ugaston <ugaston@localhost>
Date: Mon, 23 Mar 2009 16:27:16 +0000
Subject: [PATCH] Mark new knownIssue + handle better other knownIssue in Repl Conflict suite
---
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict.xml | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict.xml
index d728956..f04d50b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict.xml
@@ -2713,8 +2713,11 @@
<!-- Verify the synchronization of the trees among the servers in
the topology -->
+ <!-- If the trees don't match, we may have come across Issue 3891
+ (Replication conflict: add child , delete parent) -->
<call function="'verifyTrees'">
- [ clientHost, clientPath, server1, [server2], synchroSuffix ]
+ [ clientHost, clientPath, server1, [server2], synchroSuffix,
+ '3891' ]
</call>
<!-- Delete added entries -->
@@ -3228,8 +3231,11 @@
<!-- 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
+ (RFE: Solve naming conflict of 2 adds with same dn, different
<call function="'verifyTrees'">
- [ clientHost, clientPath, server1, [server2], synchroSuffix ]
+ [ clientHost, clientPath, server1, [server2], synchroSuffix,
+ '3401' ]
</call>
<!-- Delete added entries -->
@@ -3256,8 +3262,7 @@
'dsInstancePort' : server.getPort(),
'dsInstanceDn' : server.getRootDn(),
'dsInstancePswd' : server.getRootPwd(),
- 'dsDn' : [entryToDelete],
- 'knownIssue' : '3401'
+ 'dsDn' : [entryToDelete]
}
</call>
</paralleliterate>
@@ -3425,8 +3430,8 @@
'dsFilter' : 'givenname=DUMMY ENTRY',
'dsAttributes' : 'ds-sync-conflict uid cn',
'logStderr' : False
- }
- </call>
+ }
+ </call>
<script>
searchRC = STAXResult[0][0]
searchResult = STAXResult[0][1]
@@ -3481,13 +3486,17 @@
</message>
</sequence>
</if>
- </sequence>
- </paralleliterate>
+ </sequence>
+ </paralleliterate>
<!-- 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
+ (RFE: Solve naming conflict of 2 adds with same dn, different
+ attr value) -->
<call function="'verifyTrees'">
- [ clientHost, clientPath, server1, [server2], synchroSuffix ]
+ [ clientHost, clientPath, server1, [server2], synchroSuffix,
+ '3401' ]
</call>
<!-- Delete added entries -->
@@ -3514,8 +3523,7 @@
'dsInstancePort' : server.getPort(),
'dsInstanceDn' : server.getRootDn(),
'dsInstancePswd' : server.getRootPwd(),
- 'dsDn' : [entryToDelete],
- 'knownIssue' : '3401'
+ 'dsDn' : [entryToDelete]
}
</call>
</paralleliterate>
--
Gitblit v1.10.0