mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Christophe Sovant
31.11.2013 fecb8cd73efdc1d36391996d2a7e8cdcc2f75442
CR-2055 Use "useCompareResultCode" option for ldif-diff and ldapcompare tools
=> fixed fractional-replication tests
=> added traces in i18n tests

2 files modified
22 ■■■■ changed files
opends/tests/staf-tests/functional-tests/testcases/fractional-replication/utils.xml 13 ●●●●● patch | view | raw | blame | history
opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_dataComparison.xml 9 ●●●●● patch | view | raw | blame | history
opends/tests/staf-tests/functional-tests/testcases/fractional-replication/utils.xml
@@ -459,7 +459,7 @@
        dsReplicaPath = '%s/%s' % (dsReplica.getDir(),OPENDSNAME)
      </script>
      <call function="'SearchObject'">
      <call function="'ldapSearchWithScript'">
        { 'location'            : dsMaster.getHostname(),
          'dsPath'              : dsMasterPath,
          'dsInstanceHost'      : dsMaster.getHostname(),
@@ -468,7 +468,8 @@
          'dsInstancePswd'      : dsMaster.getRootPwd(),
          'dsBaseDN'            : baseDN,
          'dsFilter'            : 'objectclass=*',
          'dsScope'             : 'sub'
          'dsScope'             : 'sub',
          'dsDontWrap'          : 'true',
        }
      </call>
      <if expr="RC == 0">
@@ -488,6 +489,9 @@
              # if new attribute line
              elif not f[0].isspace():
                currentAttr = f.split(':',1)[0]
                # for instance if description is a valid attribute,
                # so localized description (description;lang-fr) is also valid
                currentAttr = currentAttr.split(';',1)[0]
                # if valid attribute
                if currentAttr in keptAttributes:
                  refFiltered.append(f+"\n")
@@ -511,7 +515,7 @@
      </if>
      <if expr="RC == 0">
        <sequence>
          <call function="'SearchObject'">
          <call function="'ldapSearchWithScript'">
            { 'location'            : dsReplica.getHostname(),
              'dsPath'              : dsReplicaPath,
              'dsInstanceHost'      : dsReplica.getHostname(),
@@ -520,7 +524,8 @@
              'dsInstancePswd'      : dsReplica.getRootPwd(),
              'dsBaseDN'            : 'o=example',
              'dsFilter'            : 'objectclass=*',
              'dsScope'             : 'sub'
              'dsScope'             : 'sub',
              'dsDontWrap'          : 'true',
            }
          </call>
        </sequence>
opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_dataComparison.xml
@@ -117,6 +117,15 @@
                  }
                  </call>
                  
                  <call function="'compareFile'">
                  {
                    'outputFile' : 'ldapsearch.out' ,
                    'outputPath' : remote.temp ,
                    'refFile'    : 'Data_Comparison.Ref.base64.ldif' ,
                    'refPath'    : '%s/i18n/8-bit/base64' % local.data
                  }
                  </call>
                  <call function="'testCase_Postamble'"/>
              </sequence>
          </testcase>