From 860d79341921bf3dc0300e83b73047b116ee2b63 Mon Sep 17 00:00:00 2001
From: Gary Williams <gary.williams@forgerock.com>
Date: Tue, 10 May 2011 11:00:35 +0000
Subject: [PATCH] remove known issue 4502 tag and fix ecl tests
---
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog_common_ecl_tests.xml | 61 ++++++++----------------------
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog.xml | 38 ++++++++----------
2 files changed, 33 insertions(+), 66 deletions(-)
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog.xml
index 51db26f..ab9b375 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog.xml
@@ -24,6 +24,7 @@
! CDDL HEADER END
!
! Copyright 2008-2009 Sun Microsystems, Inc.
+ ! Portions Copyright 2011 ForgeRock AS.
! -->
<stax>
@@ -66,27 +67,22 @@
% (TESTS_DIR)"/>
<call function="'replication_setup'"/>
-
-
- <!-- Run common set of ECL tests in opends proprietary mode -->
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/%s/%s/%s_common_ecl_tests.xml'
- % (TESTS_DIR, _group, _suite, _suite)"/>
- <call function="'common_ecl_tests'">
- { 'ecl_mode' : 'opends' }
- </call>
-
-
- <!-- Run common set of ECL tests in changelog draft-compatible
- ! mode -->
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/%s/%s/%s_common_ecl_tests.xml'
- % (TESTS_DIR, _group, _suite, _suite)"/>
- <call function="'common_ecl_tests'">
- { 'ecl_mode' : 'draft' }
- </call>
-
-
+ <script>
+ ecl_modes=[]
+ ecl_modes.append('opends')
+ ecl_modes.append('draft')
+ </script>
+
+ <iterate var="ecl_mode" in="ecl_modes">
+ <sequence>
+ <import machine="STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/%s/%s/%s_common_ecl_tests.xml'
+ % (TESTS_DIR, _group, _suite, _suite)"/>
+ <call function="'common_ecl_tests'">
+ { 'ecl_mode' : ecl_mode }
+ </call>
+ </sequence>
+ </iterate>
<import machine="STAF_LOCAL_HOSTNAME"
file="'%s/testcases/replication/replication_cleanup.xml'
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog_common_ecl_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog_common_ecl_tests.xml
index 56d55db..ed32691 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog_common_ecl_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog_common_ecl_tests.xml
@@ -24,6 +24,7 @@
! CDDL HEADER END
!
! Copyright 2009-2010 Sun Microsystems, Inc.
+ ! Portions Copyright 2011 ForgeRock AS.
! -->
<stax>
@@ -98,8 +99,8 @@
<call function="'ImportLdifWithScript'">
{ 'location' : masterHost,
'dsPath' : masterPath,
- 'dsBackEnd' : DIRECTORY_INSTANCE_BE,
- 'dsLdifFile' : '%s/replication/Example.ldif' \
+ 'backEnd' : DIRECTORY_INSTANCE_BE,
+ 'ldifFile' : '%s/replication/Example.ldif' \
% masterDataDir
}
</call>
@@ -177,7 +178,7 @@
self.listAttr.append('%s:%s' % (attrType, attrValue))
</script>
-
+
<!--- Test Case information
#@TestMarker Replication External Changelog Tests
#@TestName Replication: External Changelog: Add_1
@@ -4575,7 +4576,6 @@
</sequence>
</testcase>
-
<!--- Test Case information
#@TestMarker Replication External Changelog Tests
#@TestName Replication: External Changelog: Two suffixes (both
@@ -4688,13 +4688,6 @@
indexvar="indx">
<sequence>
<script>
- if ecl_mode == 'opends':
- # Issue 4502: ECL: error 53 when searching with cookie older
- # than updates on several server
- myKnownIssue = '4502'
- else:
- myKnownIssue = None
-
if globalSplitServers:
replServer = _topologyReplServerList[indx]
else:
@@ -4947,10 +4940,6 @@
indexvar="indx">
<sequence>
<script>
- # Issue 4502: ECL: error 53 when searching with cookie older
- # than updates on several server
- myKnownIssue = '4502'
-
if globalSplitServers:
replServer = _topologyReplServerList[indx]
else:
@@ -5008,18 +4997,21 @@
}
</call>
<script>
+ def getnewcookiefromerror(string):
+
+ import re
+
+ pattern = re.compile(': <(.*:);>')
+ match = re.search(pattern,string)
+
+ return match.group(1)
+
searchStringRC = STAXResult[0]
newCookie = None
if searchStringRC == 0:
- # Retrieve the suggested cookie value
- totem = 'Possible cookie:'
- lenTotem = len(totem) + 2
- indexTotem = searchResult.index(totem)
- newCookie = searchResult[indexTotem + lenTotem:]
- indexEnd = newCookie.index('>')
- newCookie = newCookie[:indexEnd]
- nextIndex = newCookie
+ newCookie = getnewcookiefromerror(searchResult)
+ nextIndex = newCookie
</script>
<message>
'This is the new changelogcookie to use: %s' % newCookie
@@ -5123,13 +5115,6 @@
indexvar="indx">
<sequence>
<script>
- if ecl_mode == 'opends':
- # Issue 4502: ECL: error 53 when searching with cookie older
- # than updates on several server
- myKnownIssue = '4502'
- else:
- myKnownIssue = None
-
if globalSplitServers:
replServer = _topologyReplServerList[indx]
else:
@@ -5461,13 +5446,6 @@
indexvar="indx">
<sequence>
<script>
- if ecl_mode == 'opends':
- # Issue 4502: ECL: error 53 when searching with cookie older
- # than updates on several server
- myKnownIssue = '4502'
- else:
- myKnownIssue = None
-
if globalSplitServers:
replServer = _topologyReplServerList[indx]
else:
@@ -5675,14 +5653,7 @@
in="_topologyServerList"
indexvar="indx">
<sequence>
- <script>
- if ecl_mode == 'opends':
- # Issue 4502: ECL: error 53 when searching with cookie older
- # than updates on several server
- myKnownIssue = '4502'
- else:
- myKnownIssue = None
-
+ <script>
if globalSplitServers:
replServer = _topologyReplServerList[indx]
else:
--
Gitblit v1.10.0