remove known issue 4502 tag and fix ecl tests

Gary Williams

10.00.2011 c9337a3b25135d0149906c801e5d9c394611f2aa

remove known issue 4502 tag and fix ecl tests 

 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'"/>
    
              <script>
                ecl_modes=[]
                ecl_modes.append('opends')
                ecl_modes.append('draft')
              </script>    
    
    
              <!-- Run common set of ECL tests in opends proprietary mode -->
              <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' : 'opends' }
                    { 'ecl_mode' : ecl_mode }
              </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>
    
    
                </sequence>             
              </iterate> 
    
              <import machine="STAF_LOCAL_HOSTNAME"
                      file="'%s/testcases/replication/replication_cleanup.xml' 

 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>
@@ -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,17 +4997,20 @@
                        } 
                      </call>
                      <script>
                        def getnewcookiefromerror(string):
                        
                          import re
                        
                          pattern = re.compile(': &lt;(.*:);&gt;')
                          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]
                          newCookie = getnewcookiefromerror(searchResult)
                          nextIndex  = newCookie
                      </script>
                      <message>
@@ -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:
@@ -5676,13 +5654,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: