From 8f29d17cb70daa36667defc9b8a7749da364eaf1 Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Wed, 31 Jul 2013 15:08:49 +0000
Subject: [PATCH] CR-2055 Use "useCompareResultCode" option for ldif-diff and ldapcompare tools => fixed fractional-replication/exclude testcase => fixed aci/compare_entry testcase
---
opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-masterOnlineImport.template | 3 ++-
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/compare_entry/compare_entry_tests.xml | 6 ++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-masterOnlineImport.template b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-masterOnlineImport.template
index e5f98b0..a0bdfdf 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-masterOnlineImport.template
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-masterOnlineImport.template
@@ -18,6 +18,7 @@
# CDDL HEADER END
#
# Copyright 2009 Sun Microsystems, Inc.
+# Portions Copyright 2013 ForgeRock AS
#
define suffix=o=example
@@ -40,7 +41,7 @@
employeeNumber: <sequential:0>
uid: user.{employeeNumber}
mail: {uid}@[maildomain]
-userPassword: password
+userPassword: \{SSHA\}vLB1TSb3UgQq4sCEcZ0fIqrxLenK7oMuhglrQw==
telephoneNumber: <random:telephone>
pager: <random:telephone>
mobile: <random:telephone>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/compare_entry/compare_entry_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/compare_entry/compare_entry_tests.xml
index 681bc37..54f4baa 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/compare_entry/compare_entry_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/compare_entry/compare_entry_tests.xml
@@ -1431,7 +1431,8 @@
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'attrToBeCompared' : 'roomnumber:4376',
- 'entryToBeCompared' : 'uid=jrunner, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' }
+ 'entryToBeCompared' : 'uid=jrunner, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com',
+ 'expectedRC' : 5 }
</call>
<script>
@@ -1585,7 +1586,8 @@
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'attrToBeCompared' : 'roomnumber:4376',
- 'entryToBeCompared' : 'uid=jrunner, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' }
+ 'entryToBeCompared' : 'uid=jrunner, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' ,
+ 'expectedRC' : 5 }
</call>
<script>
--
Gitblit v1.10.0