Improve External Changelog tests and tools

ludovicp

07.38.2010 95a3ac6055fbdb4608d402fd0985fd04b5c51a20

Improve External Changelog tests and tools

 opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog_common_ecl_tests.xml

@@ -7596,6 +7596,8 @@
                  (replServer.getHostname(), replServer.getPort(), 
                   searchResult)
                </message>
                  <if expr="len(searchResult) != 0">
                    <sequence>
                  <call function="'parseLdifEntry'">
                    { 'ldifEntry' : searchResult }
                  </call>
@@ -7643,6 +7645,23 @@
              
                </sequence>
                <else>
                      <sequence>
                        <message log="1" level="'Error'">
                         'Expected some ECL entry but NO ENTRY returned'
                        </message>
                        <!-- We may have come across issue CR 6954670:
                         !   ECL - draft: update ECL-disabled suffix, then
                         !   non-disabled suffix, make lastChangenumber
                         !   incoherent --> 
                        <call function="'setKnownIssue'">
                          { 'issueId' : 6954670 }
                        </call>
                      </sequence>
                    </else>
                  </if>
              
                </sequence>
                <else>
                  <message log="1" level="'Error'">
                    'Could not read changelog on replication server %s:%s' \
                    % (replServer.getHostname(), replServer.getPort())
@@ -7841,6 +7860,8 @@
                  (replServer.getHostname(), replServer.getPort(), 
                   searchResult)
                </message>
                  <if expr="len(searchResult) != 0">
                    <sequence>
                  <call function="'parseLdifEntry'">
                    { 'ldifEntry' : searchResult }
                  </call>
@@ -7892,6 +7913,23 @@
              
                </sequence>
                <else>
                      <sequence>
                        <message log="1" level="'Error'">
                         'Expected some ECL entry but NO ENTRY returned'
                        </message>
                        <!-- We may have come across issue CR 6954670:
                         !   ECL - draft: update ECL-disabled suffix, then
                         !   non-disabled suffix, make lastChangenumber
                         !   incoherent --> 
                        <call function="'setKnownIssue'">
                          { 'issueId' : 6954670 }
                        </call>
                      </sequence>
                    </else>
                  </if>

                </sequence>
                <else>
                  <message log="1" level="'Error'">
                    'Could not read changelog on replication server %s:%s' \
                    % (replServer.getHostname(), replServer.getPort())
@@ -8136,6 +8174,8 @@
                  (replServer.getHostname(), replServer.getPort(), 
                   searchResult)
                </message>
                  <if expr="len(searchResult) != 0">
                    <sequence>
                  <call function="'parseLdifEntry'">
                    { 'ldifEntry' : searchResult }
                  </call>
@@ -8188,6 +8228,23 @@
              
                </sequence>
                <else>
                      <sequence>
                        <message log="1" level="'Error'">
                         'Expected some ECL entry but NO ENTRY returned'
                        </message>
                        <!-- We may have come across issue CR 6954670:
                         !   ECL - draft: update ECL-disabled suffix, then
                         !   non-disabled suffix, make lastChangenumber
                         !   incoherent --> 
                        <call function="'setKnownIssue'">
                          { 'issueId' : 6954670 }
                        </call>
                      </sequence>
                    </else>
                  </if>

                </sequence>
                <else>
                  <message log="1" level="'Error'">
                    'Could not read changelog on replication server %s:%s' \
                    % (replServer.getHostname(), replServer.getPort())
@@ -8427,6 +8484,8 @@
                  (replServer.getHostname(), replServer.getPort(), 
                   searchResult)
                </message>
                  <if expr="len(searchResult) != 0">
                    <sequence>
                  <call function="'parseLdifEntry'">
                    { 'ldifEntry' : searchResult }
                  </call>
@@ -8474,6 +8533,23 @@
              
                </sequence>
                <else>
                      <sequence>
                        <message log="1" level="'Error'">
                         'Expected some ECL entry but NO ENTRY returned'
                        </message>
                        <!-- We may have come across issue CR 6954670:
                         !   ECL - draft: update ECL-disabled suffix, then
                         !   non-disabled suffix, make lastChangenumber
                         !   incoherent --> 
                        <call function="'setKnownIssue'">
                          { 'issueId' : 6954670 }
                        </call>
                      </sequence>
                    </else>
                  </if>

                </sequence>
                <else>
                  <message log="1" level="'Error'">
                    'Could not read changelog on replication server %s:%s' \
                    % (replServer.getHostname(), replServer.getPort())
@@ -8686,6 +8762,8 @@
                  (replServer.getHostname(), replServer.getPort(), 
                   searchResult)
                </message>
                  <if expr="len(searchResult) != 0">
                    <sequence>
                  <call function="'parseLdifEntry'">
                    { 'ldifEntry' : searchResult }
                  </call>
@@ -8734,6 +8812,23 @@
              
                </sequence>
                <else>
                      <sequence>
                        <message log="1" level="'Error'">
                         'Expected some ECL entry but NO ENTRY returned'
                        </message>
                        <!-- We may have come across issue CR 6954670:
                         !   ECL - draft: update ECL-disabled suffix, then
                         !   non-disabled suffix, make lastChangenumber
                         !   incoherent --> 
                        <call function="'setKnownIssue'">
                          { 'issueId' : 6954670 }
                        </call>
                      </sequence>
                    </else>
                  </if>

                </sequence>
                <else>
                  <message log="1" level="'Error'">
                    'Could not read changelog on replication server %s:%s' \
                    % (replServer.getHostname(), replServer.getPort())
@@ -8983,6 +9078,8 @@
                    % (replServer.getHostname(), replServer.getPort(), 
                       searchResult)
                  </message>
                  <if expr="len(searchResult) != 0">
                    <sequence>
                  <call function="'parseLdifEntries'">
                    { 'ldifEntries' : searchResult }
                  </call>
@@ -9079,6 +9176,23 @@
                  
                </sequence>
                <else>
                      <sequence>
                        <message log="1" level="'Error'">
                         'Expected some ECL entry but NO ENTRY returned'
                        </message>
                        <!-- We may have come across issue CR 6954670:
                         !   ECL - draft: update ECL-disabled suffix, then
                         !   non-disabled suffix, make lastChangenumber
                         !   incoherent --> 
                        <call function="'setKnownIssue'">
                          { 'issueId' : 6954670 }
                        </call>
                      </sequence>
                    </else>
                  </if>

                </sequence>
                <else>
                  <message log="1" level="'Error'">
                    'Could not read changelog on replication server %s:%s' \
                    % (replServer.getHostname(), replServer.getPort())

 opends/tests/staf-tests/shared/functions/ldap.xml

@@ -3589,6 +3589,19 @@
        '%s %s' % (STAFCmd, STAFCmdParams)
      </message>
      
      <!-- Give the changes time to propagate in the ECL -->
      <script>
        myCounter = 1
        taskRC    = 1
        noOfLoops = 10
      </script>
      <loop from="1" to="noOfLoops" while="taskRC != 0">
        <sequence>
        
          <message>
            'LOOP number %s - %s %s' % (myCounter, STAFCmd, STAFCmdParams)
          </message>
    
      <call function="'runCommand'">
        { 'command'   : STAFCmd,
          'arguments' : STAFCmdParams,
@@ -3598,6 +3611,21 @@
          'knownIssue': knownIssue
        }
      </call>
          <script>
            STAFCmdRC     = RC
            STAFCmdResult = STAXResult
            myCounter     = myCounter + 1
          </script>
          
          <if expr='STAFCmdResult[0][1] != None and len(STAFCmdResult[0][1].strip()) > 0'>
            <sequence>
              <script>taskRC = 0</script>
              <return>STAFCmdResult</return>
            </sequence>
          </if>
        </sequence>
      </loop>
      
      <return>
        STAXResult
      </return>