From e12dc597a747f4eae88eb89e9a1258887c2517e4 Mon Sep 17 00:00:00 2001
From: el_kaboing <el_kaboing@localhost>
Date: Sat, 24 Mar 2007 00:02:34 +0000
Subject: [PATCH] The new global ACIs that were recently committed are now accounted for in the ACI functional tests.
---
opends/tests/functional-tests/testcases/aci/aci_targetattr.xml | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml b/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml
index a047801..06c0795 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml
@@ -69,6 +69,22 @@
<testcase name="'ACI: Targetattr: Preamble'">
<sequence>
<call function="'testCase_Preamble'"/>
+ <message>
+ 'ACI: Targetattr: Preamble - Removing Search Global ACI'
+ </message>
+
+ <call function="'modifyEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_rm_global_search.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <if expr="RC != 0">
+ <tcstatus result="'fail'"/>
+ </if>
+
<message>
'ACI: Targetattr: Preamble - existing branch, user searching entry that will be targeted in future tests'
</message>
@@ -1373,11 +1389,32 @@
returnString = STAXResult[0][1]
</script>
- <call function="'checktestStringNotPresent'">
+ <call function="'searchStringForSubstring'">
{ 'returnString' : returnString ,
'testString' : 'dn: uid=tmorris,ou=People,ou=non-aci branch,o=ACI Tests' }
</call>
+ <if expr="returnCode != '0'">
+ <tcstatus result="'fail'"/>
+ </if>
+
+ <message>
+ 'ACI: Targetattr: Postamble - Resetting Search Global ACI'
+ </message>
+
+ <call function="'modifyEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_reset_global_search.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
<call function="'testCase_Postamble'"/>
</sequence>
--
Gitblit v1.10.0