Improve tests for clu, dsconfig and backend. Also preserve code coverage re...

ludovicp

15.50.2010 484bfaad4e5a19fbdc5bad504768d6df28afd982

 opends/tests/staf-tests/functional-tests/testcases/backends/export/export_tests.xml

@@ -772,8 +772,7 @@
          </call>
          
          <call function="'checkImport'">
            { 'expectedEntries' : ['dc=com','dc=example,dc=com'],
              'missingEntries'  : ['ou=People,dc=example,dc=com'],
            { 'expectedEntries' : ['dc=com','dc=example,dc=com','ou=People,dc=example,dc=com'],
              'dsPath'          : '%s/%s' % (DsInstanceDir, OPENDSNAME),
              'dsPort'          : DsInstancePort,
              'dsAdminPort'     : DsInstanceAdminPort,

 opends/tests/staf-tests/functional-tests/testcases/backends/import-tasks/import-tasks_tests.xml

@@ -485,8 +485,7 @@
          </call>

          <call function="'checkImport'">
            { 'expectedEntries' : ['dc=com','dc=example,dc=com'],
              'missingEntries'  : ['ou=People,dc=example,dc=com'],
            { 'expectedEntries' : ['dc=com','dc=example,dc=com','ou=People,dc=example,dc=com'],
              'startDS'         : 'no'
            }
          </call>

 opends/tests/staf-tests/functional-tests/testcases/backends/import/import_tests.xml

@@ -504,9 +504,7 @@
          </call>

          <call function="'checkImport'">
            { 'expectedEntries' : ['dc=com','dc=example,dc=com'],
              'missingEntries'  : ['ou=People,dc=example,dc=com'] 
            }
            { 'expectedEntries' : ['dc=com','dc=example,dc=com','ou=People,dc=example,dc=com'] }
          </call>
        
        </sequence>

 opends/tests/staf-tests/functional-tests/testcases/clu/clu_dbtest_checkbehavior.xml

@@ -236,7 +236,7 @@
                <call function="'checktestString'">
                  { 
                  'returnString'   : returnString ,
                  'expectedString' : 'Total: 19'
                  'expectedString' : 'Total: 20'
                  }
                </call>             
             
@@ -309,7 +309,7 @@
                <call function="'checktestString'">
                  { 
                  'returnString'   : returnString ,
                  'expectedString' : 'Total: 23'
                  'expectedString' : 'Total: 24'
                  }
                </call>
                

 opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_batch-mode/dsconfig_batch-mode_tests.xml

@@ -222,7 +222,7 @@

          <!-- Search for uniqueMember indexes -->
          <call function="'searchString'">
            { 'expectedString' : 'uniqueMember    : generic : equality',
            { 'expectedString' : 'uniqueMember     : generic : equality',
              'returnString'   : resultString ,
            }
          </call>

 opends/tests/staf-tests/shared/tests/runTests.xml

@@ -209,6 +209,31 @@
              'path'      : remoteCoveragePath
            }
          </call>

          <if expr="RC != 0">
            <sequence>
              <message>
                'Zip up coverage files to %s/coverage.zip' % remote.temp
              </message>
              <call function="'zipUpFile'">
                { 'location'   : STAF_REMOTE_HOSTNAME,
                  'zipfile'    : '%s/coverage.zip' % remote.temp,
                  'folder'     : '%s/coverage' % remote.temp,
                  'relativeto' : remote.temp
                }
              </call>

              <message>
                'Copy coverage zip archive to %s/coverage.zip' % local.temp
              </message>
              <call function="'copyFile'">
                { 'location'   : STAF_REMOTE_HOSTNAME,
                  'srcfile'    : '%s/coverage.zip' % remote.temp,
                  'destfile'   : '%s/coverage.zip' % local.temp,
                  'remotehost' : STAXServiceMachine }
              </call>
            </sequence>
          </if>
        </sequence>
      </if>