From 157c23ce263d9098d724fa5193d217e226b61873 Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Fri, 26 Jul 2013 09:17:20 +0000
Subject: [PATCH] CR-2055 Use "useCompareResultCode" option for ldif-diff and ldapcompare tools
---
opends/tests/staf-tests/shared/functions/ldap.xml | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/opends/tests/staf-tests/shared/functions/ldap.xml b/opends/tests/staf-tests/shared/functions/ldap.xml
index a8ae902..6cca0e2 100755
--- a/opends/tests/staf-tests/shared/functions/ldap.xml
+++ b/opends/tests/staf-tests/shared/functions/ldap.xml
@@ -2106,7 +2106,7 @@
</function-arg-description>
<function-arg-property name="type" value="dn"/>
</function-arg-def>
- <function-arg-def name="useCmpRC" type="optional">
+ <function-arg-def name="useCmpRC" type="optional" default="'True'">
<function-arg-description>
Use an exit code that indicates whether comparison is successful.
Results are an exit code of 6 (COMPARE_TRUE) or
@@ -2114,9 +2114,9 @@
</function-arg-description>
<function-arg-property name="type" value="option"/>
</function-arg-def>
- <function-arg-def name="expectedRC" type="optional" default="0">
+ <function-arg-def name="expectedRC" type="optional" default="6">
<function-arg-description>
- Expected return code value. Default value is 0
+ Expected return code value. Default value is 6 (COMPARE_TRUE).
Wildcard 'noCheck' to not check the RC
</function-arg-description>
<function-arg-property name="type" value="integer"/>
@@ -2223,7 +2223,7 @@
if dsUseSSL:
STAFCmdParamsList.append('-Z')
- if useCmpRC:
+ if useCmpRC == 'True':
STAFCmdParamsList.append('--useCompareResultCode')
if dsDn:
@@ -2308,9 +2308,17 @@
</function-arg-description>
<function-arg-property name="type" value="string"/>
</function-arg-def>
- <function-arg-def name="expectedRC" type="optional" default="0">
+ <function-arg-def name="useCmpRC" type="optional" default="'True'">
<function-arg-description>
- Expected return code value. Default value is 0
+ Use an exit code that indicates whether comparison is successful.
+ 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="expectedRC" type="optional" default="6">
+ <function-arg-description>
+ Expected return code value. Default value is 6 (COMPARE_TRUE).
Wildcard 'noCheck' to not check the RC
</function-arg-description>
<function-arg-property name="type" value="integer"/>
@@ -2341,7 +2349,10 @@
<!-- Set common ldap arguments -->
<call function="'_ldapCommonArgs'"/>
- <script>
+ <script>
+ if useCmpRC == 'True':
+ STAFCmdParamsList.append('--useCompareResultCode')
+
if extraParams:
STAFCmdParamsList.append('%s' % extraParams)
--
Gitblit v1.10.0