Added some checks to avoid python exception

Christophe Sovant

10.11.2013 31e7c0acdf334b8eade9f36d92c2b4f1d3736e5a

Added some checks to avoid python exception

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

@@ -355,8 +355,7 @@
                    'Parsed changelog entry:  \n%s' % eclEntry
                  </message>
                  <message>
                    'Index to use for the next ECL search:  %s' % \
                    nextIndex
                    'Index to use for the next ECL search:  %s' % nextIndex
                  </message>
                      
                  <if expr="addedEntry and eclEntry">
@@ -2713,8 +2712,8 @@
                      </message>
                    <call function="'testFailed'"/>
                    </sequence>
                  </if>
                  
                    <else>
                      <sequence>
                  <iterate var="eclEntry"
                           in="eclEntries"
                           indexvar="i">
@@ -2781,7 +2780,9 @@
                      
                    </sequence>
                  </iterate>
                  
                      </sequence>
                    </else>
                  </if>
                </sequence>
                <else>
                  <message log="1" level="'Error'">
@@ -3052,8 +3053,8 @@
                      </message>
                    <call function="'testFailed'"/>
                    </sequence>
                  </if>
                  
                    <else>
                      <sequence>
                  <iterate var="eclEntry"
                           in="eclEntries"
                           indexvar="i">
@@ -3120,7 +3121,9 @@
                      
                    </sequence>
                  </iterate>
                  
                      </sequence>
                    </else>
                  </if>
                </sequence>
                <else>
                  <message log="1" level="'Error'">
@@ -3317,8 +3320,8 @@
                      </message>
                      <call function="'testFailed'"/>
                    </sequence>
                  </if>
                  
                    <else>
                      <sequence>
                  <iterate var="eclEntry"
                           in="eclEntries"
                           indexvar="i">
@@ -3383,7 +3386,9 @@
                      
                    </sequence>
                  </iterate>
                  
                      </sequence>
                    </else>
                  </if>
                </sequence>
                <else>
                  <message log="1" level="'Error'">
@@ -3542,8 +3547,6 @@
                   indexvar="indx">
            <sequence>
              <script>
                myKnownIssue = None
                
                replServer = server
                replServerPath = '%s/%s' % (replServer.getDir(), OPENDSNAME)
              </script>
@@ -3566,8 +3569,7 @@
                  'dsBaseDN'           : 'cn=changelog',
                  'dsFilter'           : '(objectclass=*)',
                  'changeNumberFilter' : chgNumberFilter,
                  'changelogCookie'    : lastCookie,
                  'knownIssue'         : myKnownIssue
                  'changelogCookie'    : lastCookie
                }                
              </call>
              <script>
@@ -3596,8 +3598,8 @@
                      </message>
                    <call function="'testFailed'"/>
                    </sequence>
                  </if>
                  
                    <else>
                      <sequence>
                  <iterate var="eclEntry"
                           in="eclEntries"
                           indexvar="i">
@@ -3662,7 +3664,9 @@
                      
                    </sequence>
                  </iterate>
                  
                      </sequence>
                    </else>
                  </if>
                </sequence>
                <else>
                  <message log="1" level="'Error'">
@@ -3827,8 +3831,6 @@
                   indexvar="indx">
            <sequence>
              <script>
                myKnownIssue = None
                
                replServer = server
                replServerPath = '%s/%s' % (replServer.getDir(), OPENDSNAME)
              </script>
@@ -3851,8 +3853,7 @@
                  'dsBaseDN'           : 'cn=changelog',
                  'dsFilter'           : '(objectclass=*)',
                  'changeNumberFilter' : chgNumberFilter,
                  'changelogCookie'    : lastCookie,
                  'knownIssue'         : myKnownIssue
                  'changelogCookie'    : lastCookie
                }                
              </call>
              <script>
@@ -3881,8 +3882,8 @@
                      </message>
                    <call function="'testFailed'"/>
                    </sequence>
                  </if>
                  
                    <else>
                      <sequence>
                  <iterate var="eclEntry"
                           in="eclEntries"
                           indexvar="i">
@@ -3949,7 +3950,9 @@
                      
                    </sequence>
                  </iterate>
                  
                      </sequence>
                    </else>
                  </if>
                </sequence>
                <else>
                  <message log="1" level="'Error'">
@@ -4107,8 +4110,6 @@
                   indexvar="indx">
            <sequence>
              <script>
                myKnownIssue = None
                
                replServer = server
                replServerPath = '%s/%s' % (replServer.getDir(), OPENDSNAME)
              </script>
@@ -4131,8 +4132,7 @@
                  'dsBaseDN'           : 'cn=changelog',
                  'dsFilter'           : '(objectclass=*)',
                  'changeNumberFilter' : chgNumberFilter,
                  'changelogCookie'    : lastCookie,
                  'knownIssue'         : myKnownIssue
                  'changelogCookie'    : lastCookie
                }                
              </call>
              <script>
@@ -4340,8 +4340,6 @@
                   indexvar="indx">
            <sequence>
              <script>
                myKnownIssue = None
                
                replServer = server
                replServerPath = '%s/%s' % (replServer.getDir(), OPENDSNAME)
              </script>
@@ -4364,8 +4362,7 @@
                  'dsBaseDN'           : 'cn=changelog',
                  'dsFilter'           : '(objectclass=*)',
                  'changeNumberFilter' : chgNumberFilter,
                  'changelogCookie'    : lastCookie,
                  'knownIssue'         : myKnownIssue
                  'changelogCookie'    : lastCookie
                }                
              </call>
              <script>
@@ -4593,8 +4590,7 @@
                  'dsBaseDN'           : 'cn=changelog',
                  'dsFilter'           : '(objectclass=*)',
                  'changeNumberFilter' : chgNumberFilter,
                  'changelogCookie'    : lastCookie,
                  'knownIssue'         : myKnownIssue
                  'changelogCookie'    : lastCookie
                }                
              </call>
              <script>
@@ -4822,8 +4818,7 @@
                      </message>
                      <call function="'searchString'">
                        { 'expectedString' : 'is missing the replicated domain',
                          'returnString'   : searchResult,
                          'knownIssue'     : myKnownIssue
                          'returnString'   : searchResult
                        } 
                      </call>
                      <script>
@@ -5013,8 +5008,7 @@
                  'dsBaseDN'           : 'cn=changelog',
                  'dsFilter'           : '(objectclass=*)',
                  'changeNumberFilter' : chgNumberFilter,
                  'changelogCookie'    : lastCookie,
                  'knownIssue'         : myKnownIssue
                  'changelogCookie'    : lastCookie
                }                
              </call>
              <script>
@@ -5340,8 +5334,7 @@
                  'dsBaseDN'           : eclSearchBaseDn,
                  'dsFilter'           : eclSearchFilter,
                  'changeNumberFilter' : chgNumberFilter,
                  'changelogCookie'    : lastCookie,
                  'knownIssue'         : myKnownIssue
                  'changelogCookie'    : lastCookie
                }                
              </call>
              <script>
@@ -5544,8 +5537,7 @@
                  'dsBaseDN'           : eclSearchBaseDn,
                  'dsFilter'           : eclSearchFilter,
                  'changeNumberFilter' : chgNumberFilter,
                  'changelogCookie'    : lastCookie,
                  'knownIssue'         : myKnownIssue               
                  'changelogCookie'    : lastCookie             
                }
              </call>
              <script>
@@ -6244,8 +6236,7 @@
                  'dsBaseDN'           : 'cn=changelog',
                  'dsFilter'           : '(objectclass=*)',
                  'changeNumberFilter' : chgNumberFilter,
                  'changelogCookie'    : lastCookie,
                  'knownIssue'         : myKnownIssue
                  'changelogCookie'    : lastCookie
                }                
              </call>
              <script>
@@ -6690,8 +6681,7 @@
                        'changeType'      : myChangeType,
                        'changeTime'      : myChangeTime,
                        'targetEntryUUID' : myTargetEntryUUID,
                        'changes'         : myChanges,
                        'knownIssue'      : myKnownIssue
                        'changes'         : myChanges
                      }
                    </call>
                    <else>
@@ -6930,8 +6920,6 @@
                   indexvar="indx">
            <sequence>
              <script>
                myKnownIssue = None
                
                replServer = server
                replServerPath = '%s/%s' % (replServer.getDir(), OPENDSNAME)
              </script>
@@ -6954,8 +6942,7 @@
                  'dsBaseDN'           : 'cn=changelog',
                  'dsFilter'           : '(objectclass=*)',
                  'changeNumberFilter' : chgNumberFilter,
                  'changelogCookie'    : lastCookie,
                  'knownIssue'         : myKnownIssue
                  'changelogCookie'    : lastCookie
                }                
              </call>
              <script>
@@ -6984,8 +6971,8 @@
                      </message>
                    <call function="'testFailed'"/>
                    </sequence>
                  </if>
                  
                    <else>
                      <sequence>
                  <iterate var="eclEntry"
                           in="eclEntries"
                           indexvar="i">
@@ -7050,7 +7037,9 @@
                      
                    </sequence>
                  </iterate>
                  
                      </sequence>
                    </else>
                  </if>
                </sequence>
                <else>
                  <message log="1" level="'Error'">
@@ -7369,8 +7358,7 @@
                        'Parsed changelog entry:  \n%s' % eclEntry
                      </message>
                      <message>
                        'Index to use for the next ECL search:  %s' % \
                        nextIndex
                        'Index to use for the next ECL search:  %s' % nextIndex
                      </message>
                          
                      <if expr="addedEntry and eclEntry">
@@ -7622,8 +7610,7 @@
                        'Parsed changelog entry:  \n%s' % eclEntry
                      </message>
                      <message>
                        'Index to use for the next ECL search:  %s' % \
                        nextIndex
                        'Index to use for the next ECL search:  %s' % nextIndex
                      </message>

                      <if expr="addedEntry and eclEntry">
@@ -7917,8 +7904,7 @@
                        'Parsed changelog entry:  \n%s' % eclEntry
                      </message>
                      <message>
                        'Index to use for the next ECL search:  %s' % \
                        nextIndex
                        'Index to use for the next ECL search:  %s' % nextIndex
                      </message>

                      <if expr="addedEntry and eclEntry">
@@ -8208,8 +8194,7 @@
                        'Parsed changelog entry:  \n%s' % eclEntry
                      </message>
                      <message>
                        'Index to use for the next ECL search:  %s' % \
                        nextIndex
                        'Index to use for the next ECL search:  %s' % nextIndex
                      </message>
                          
                      <if expr="addedEntry and eclEntry">
@@ -8475,8 +8460,7 @@
                        'Parsed changelog entry:  \n%s' % eclEntry
                      </message>
                      <message>
                        'Index to use for the next ECL search:  %s' % \
                        nextIndex
                        'Index to use for the next ECL search:  %s' % nextIndex
                      </message>
                          
                      <if expr="addedEntry and eclEntry">
@@ -8775,8 +8759,8 @@
                          </message>
                        <call function="'testFailed'"/>
                        </sequence>
                      </if>
                      
                        <else>
                          <sequence>
                      <iterate var="eclEntry"
                               in="eclEntries"
                               indexvar="i">
@@ -8849,7 +8833,9 @@
                          
                        </sequence>
                      </iterate>
                  
                          </sequence>
                        </else>
                      </if>
                    </sequence>
                    <else>
                      <sequence>