CR-1344 Update ldif-diff testcases following fix for issue OPENDJ-778

Christophe Sovant

01.06.2013 40be3eeb3b597cffdec99f056dbcc2654166a066

CR-1344 Update ldif-diff testcases following fix for issue OPENDJ-778

 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_rebuild-index_checkbehavior.xml

@@ -1373,7 +1373,7 @@
              #@TestMarker          rebuild-index check behavior tests
              #@TestName            rebuild-index: clearDegradedState and 
                                    rebuildAll options
              #@TestIssue           OPENDJ-771
              #@TestIssue           none
              #@TestPurpose         Verify that rebuild-index command failed
                                    and that the output is correct.
              #@TestPreamble        none
@@ -1404,8 +1404,7 @@
                  'dsBaseDN'             : 'dc=com' ,
                  'dsClearDegradedState' : 'True' ,
                  'dsRebuildAll'         : 'True' ,
                  'expectedRC'           : 1 ,
                  'knownIssue'           : 'OPENDJ-771'
                  'expectedRC'           : 1
                  }
                </call>

@@ -1424,8 +1423,7 @@
                <call function="'searchString'">
                  {
                  'returnString'   : returnString ,
                  'expectedString' : '%s %s' % (msg1, msg2) ,
                  'knownIssue'     : 'OPENDJ-771'
                  'expectedString' : '%s %s' % (msg1, msg2)
                  }
                </call>

@@ -1439,7 +1437,7 @@
              #@TestMarker          rebuild-index check behavior tests
              #@TestName            rebuild-index: clearDegradedState and 
                                    rebuildDegraded options
              #@TestIssue           OPENDJ-771
              #@TestIssue           none
              #@TestPurpose         Verify that rebuild-index command failed
                                    and that the output is correct.
              #@TestPreamble        none
@@ -1470,8 +1468,7 @@
                  'dsBaseDN'             : 'dc=com' ,
                  'dsClearDegradedState' : 'True' ,
                  'dsRebuildDegraded'    : 'True' ,
                  'expectedRC'           : 1 ,
                  'knownIssue'           : 'OPENDJ-771'
                  'expectedRC'           : 1
                  }
                </call>


 opendj-sdk/opends/tests/staf-tests/shared/functions/tools.xml

@@ -24,6 +24,7 @@
 ! CDDL HEADER END
 !
 !      Copyright 2007-2010 Sun Microsystems, Inc.
 !      Portions Copyright 2013 ForgeRock AS
 ! -->
<stax>
  <!-- This function uses make ldif to generate LDIF data files -->
@@ -1738,6 +1739,15 @@
        </function-arg-description>
        <function-arg-property name="type" value="option"/>
      </function-arg-def>
      <function-arg-def name="useCmpRC" type="optional">
        <function-arg-description>
          Use an exit code that indicates whether a given clear-text password
          matched a provided encoded password.
          Results are an exit code of 6 (COMPARE_TRUE) or
          an exit code of 5 (COMPARE_FALSE).
        </function-arg-description>
        <function-arg-property name="type" value="option"/>
      </function-arg-def>
      <function-arg-def name="dsHelp" type="optional">
        <function-arg-description>
          Help option
@@ -1781,6 +1791,9 @@
          foldersToCreate.append(os.path.dirname(outputLdif))
          STAFCmdParamsList.append('-o %s' % outputLdif)
        
        if useCmpRC:
          STAFCmdParamsList.append('-r')

        if overwriteExisting:
          STAFCmdParamsList.append('-O')