From fecb8cd73efdc1d36391996d2a7e8cdcc2f75442 Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Tue, 30 Jul 2013 22:11:32 +0000
Subject: [PATCH] CR-2055 Use "useCompareResultCode" option for ldif-diff and ldapcompare tools => fixed fractional-replication tests => added traces in i18n tests
---
opends/tests/staf-tests/functional-tests/testcases/fractional-replication/utils.xml | 13 +++++++++----
opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_dataComparison.xml | 9 +++++++++
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/utils.xml b/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/utils.xml
index 3e8336e..30d9998 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/utils.xml
+++ b/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>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_dataComparison.xml b/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_dataComparison.xml
index 05f77a3..3f53da0 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_dataComparison.xml
+++ b/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>
--
Gitblit v1.10.0