From 8ff930b522eaba1b6e111320611a84c7a6d5edf4 Mon Sep 17 00:00:00 2001
From: el_kaboing <el_kaboing@localhost>
Date: Thu, 22 Mar 2007 20:16:46 +0000
Subject: [PATCH] Added the ability for the aci for each functional test to be echoed into the stdout and log files for the stax framework.
---
opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_targetfilter/del_aci.ldif | 29 +++
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_target.xml | 110 +++++++++++--
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml | 90 +++++++++--
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml | 200 ++++++++++++++++++------
opendj-sdk/opends/tests/functional-tests/shared/python/security.py | 10 +
5 files changed, 350 insertions(+), 89 deletions(-)
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_targetfilter/del_aci.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_targetfilter/del_aci.ldif
new file mode 100644
index 0000000..300e18c
--- /dev/null
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_targetfilter/del_aci.ldif
@@ -0,0 +1,29 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2007 Sun Microsystems, Inc.
+#
+
+dn: ou=aci branch, o=ACI Tests, dc=example,dc=com
+changetype: modify
+delete: aci
+
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/python/security.py b/opendj-sdk/opends/tests/functional-tests/shared/python/security.py
index f2f4a6f..7115070 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/python/security.py
+++ b/opendj-sdk/opends/tests/functional-tests/shared/python/security.py
@@ -25,6 +25,16 @@
#
# Portions Copyright 2007 Sun Microsystems, Inc.
+def retrieve_aci(filename):
+ aci_file = open(filename,"r")
+ ret_str = "none"
+
+ for line in aci_file.readlines():
+ aci_index = line.find("aci:")
+ if aci_index > -1:
+ ret_str = line
+ return ret_str
+
def write_ldaps_ldif_file(path, port):
ldif_file = open(path + "/ldaps_port.ldif","w")
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_target.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_target.xml
index 303f0bb..bbdb45f 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_target.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_target.xml
@@ -149,8 +149,14 @@
<testcase name="'ACI: Target: Target Equals DN'">
<sequence>
<call function="'testCase_Preamble'"/>
+
+ <script>
+ curr_aci_ldif_file = '%s/aci/aci_target/add_aci1.ldif' % STAGED_DATA_DIR
+ curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ </script>
+
<message>
- 'ACI: Target: Target Equals DN, preamble adding aci'
+ 'ACI: Target: Target Equals DN, preamble adding aci,\n %s' % curr_aci
</message>
<call function="'modifyEntry'">
@@ -158,7 +164,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/add_aci1.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s' % curr_aci_ldif_file }
</call>
<if expr="RC != 0">
@@ -286,8 +292,14 @@
<testcase name="'ACI: Target: Target Equals DN - new branch'">
<sequence>
<call function="'testCase_Preamble'"/>
+
+ <script>
+ curr_aci_ldif_file = '%s/aci/aci_target/add_entries1.ldif' % STAGED_DATA_DIR
+ curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ </script>
+
<message>
- 'ACI: Target: Target Equals DN - new branch, preamble adding entries'
+ 'ACI: Target: Target Equals DN - new branch, preamble adding entries,\n %s' % curr_aci
</message>
<call function="'addEntry'">
@@ -295,7 +307,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/aci/aci_target/add_entries1.ldif' % STAGED_DATA_DIR }
+ 'entryToBeAdded' : '%s' % curr_aci_ldif_file }
</call>
<if expr="RC != 0">
@@ -441,8 +453,14 @@
<testcase name="'ACI: Target: Target Equals DN With Trailing Wildcard'">
<sequence>
<call function="'testCase_Preamble'"/>
+
+ <script>
+ curr_aci_ldif_file = '%s/aci/aci_target/add_aci3.ldif' % STAGED_DATA_DIR
+ curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ </script>
+
<message>
- 'ACI: Target: Target Equals DN with trailing wildcard, preamble adding aci'
+ 'ACI: Target: Target Equals DN with trailing wildcard, preamble adding aci,\n %s' % curr_aci
</message>
<call function="'modifyEntry'">
@@ -450,7 +468,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/add_aci3.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s' % curr_aci_ldif_file }
</call>
<if expr="RC != 0">
@@ -577,8 +595,14 @@
<testcase name="'ACI: Target: Target Equals DN With Leading Wildcard'">
<sequence>
<call function="'testCase_Preamble'"/>
+
+ <script>
+ curr_aci_ldif_file = '%s/aci/aci_target/add_aci4.ldif' % STAGED_DATA_DIR
+ curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ </script>
+
<message>
- 'ACI: Target: Target Equals DN with leading wildcard, preamble adding aci'
+ 'ACI: Target: Target Equals DN with leading wildcard, preamble adding aci,\n %s' % curr_aci
</message>
<call function="'modifyEntry'">
@@ -586,7 +610,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/add_aci4.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s' % curr_aci_ldif_file }
</call>
<if expr="RC != 0">
@@ -713,8 +737,14 @@
<testcase name="'ACI: Target: Target Equals DN With Internal Wildcard'">
<sequence>
<call function="'testCase_Preamble'"/>
+
+ <script>
+ curr_aci_ldif_file = '%s/aci/aci_target/add_aci5.ldif' % STAGED_DATA_DIR
+ curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ </script>
+
<message>
- 'ACI: Target: Target Equals DN with internal wildcard, preamble adding aci'
+ 'ACI: Target: Target Equals DN with internal wildcard, preamble adding aci,\n %s' % curr_aci
</message>
<call function="'modifyEntry'">
@@ -722,7 +752,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/add_aci5.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s' % curr_aci_ldif_file }
</call>
<if expr="RC != 0">
@@ -849,8 +879,14 @@
<testcase name="'ACI: Target: Target Equals DN With Multiple Wildcards'">
<sequence>
<call function="'testCase_Preamble'"/>
+
+ <script>
+ curr_aci_ldif_file = '%s/aci/aci_target/add_aci6.ldif' % STAGED_DATA_DIR
+ curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ </script>
+
<message>
- 'ACI: Target: Target Equals DN with multiple wildcards, preamble adding aci'
+ 'ACI: Target: Target Equals DN with multiple wildcards, preamble adding aci,\n %s' % curr_aci
</message>
<call function="'modifyEntry'">
@@ -858,7 +894,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/add_aci6.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s' % curr_aci_ldif_file }
</call>
<if expr="RC != 0">
@@ -982,8 +1018,14 @@
<testcase name="'ACI: Target: Target Equals DN With Keyword self'">
<sequence>
<call function="'testCase_Preamble'"/>
+
+ <script>
+ curr_aci_ldif_file = '%s/aci/aci_target/add_aci8.ldif' % STAGED_DATA_DIR
+ curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ </script>
+
<message>
- 'ACI: Target: Target Equals DN With Keyword self - add aci'
+ 'ACI: Target: Target Equals DN With Keyword self - add aci,\n %s' % curr_aci
</message>
<call function="'modifyEntry'">
@@ -991,7 +1033,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/add_aci8.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s' % curr_aci_ldif_file }
</call>
<if expr="RC != 21">
@@ -1046,8 +1088,14 @@
<testcase name="'ACI: Target: Target Equals DN Above Entry'">
<sequence>
<call function="'testCase_Preamble'"/>
+
+ <script>
+ curr_aci_ldif_file = '%s/aci/aci_target/add_aci9.ldif' % STAGED_DATA_DIR
+ curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ </script>
+
<message>
- 'ACI: Target: Target Equals DN Above Entry - add aci'
+ 'ACI: Target: Target Equals DN Above Entry - add aci,\n %s' % curr_aci
</message>
<call function="'modifyEntry'">
@@ -1055,7 +1103,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/add_aci9.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s' % curr_aci_ldif_file }
</call>
<if expr="RC != 50">
@@ -1111,8 +1159,14 @@
<testcase name="'ACI: Target: Target Equals DN Below Entry'">
<sequence>
<call function="'testCase_Preamble'"/>
+
+ <script>
+ curr_aci_ldif_file = '%s/aci/aci_target/add_aci9a.ldif' % STAGED_DATA_DIR
+ curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ </script>
+
<message>
- 'ACI: Target: Target Equals DN Below Entry - add aci'
+ 'ACI: Target: Target Equals DN Below Entry - add aci,\n %s' % curr_aci
</message>
<call function="'modifyEntry'">
@@ -1120,7 +1174,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/add_aci9a.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s' % curr_aci_ldif_file }
</call>
<if expr="RC != 0">
@@ -1246,8 +1300,14 @@
<testcase name="'ACI: Target: Multiple Targets'">
<sequence>
<call function="'testCase_Preamble'"/>
+
+ <script>
+ curr_aci_ldif_file = '%s/aci/aci_target/add_aci10.ldif' % STAGED_DATA_DIR
+ curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ </script>
+
<message>
- 'ACI: Target: Multiple Targets - add aci'
+ 'ACI: Target: Multiple Targets - add aci,\n %s' % curr_aci
</message>
<call function="'modifyEntry'">
@@ -1255,7 +1315,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/add_aci10.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s' % curr_aci_ldif_file }
</call>
<if expr="RC != 21">
@@ -1311,8 +1371,14 @@
<testcase name="'ACI: Target: Keyword Target Misspelled'">
<sequence>
<call function="'testCase_Preamble'"/>
+
+ <script>
+ curr_aci_ldif_file = '%s/aci/aci_target/add_aci11.ldif' % STAGED_DATA_DIR
+ curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ </script>
+
<message>
- 'ACI: Target: Keyword Target Misspelled - add aci'
+ 'ACI: Target: Keyword Target Misspelled - add aci,\n %s' % curr_aci
</message>
<call function="'modifyEntry'">
@@ -1320,7 +1386,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/add_aci11.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s' % curr_aci_ldif_file }
</call>
<if expr="RC != 21">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml
index 2679e06..a047801 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml
@@ -147,8 +147,14 @@
<testcase name="'ACI: Targetattr: Targetattr Equals One Attribute'">
<sequence>
<call function="'testCase_Preamble'"/>
+
+ <script>
+ curr_aci_ldif_file = '%s/aci/aci_targetattr/add_aci1.ldif' % STAGED_DATA_DIR
+ curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ </script>
+
<message>
- 'ACI: Targetattr: Targetattr Equals One Attribute, preamble adding aci'
+ 'ACI: Targetattr: Targetattr Equals One Attribute, preamble adding aci,\n %s' % curr_aci
</message>
<call function="'modifyEntry'">
@@ -156,7 +162,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetattr/add_aci1.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s' % curr_aci_ldif_file }
</call>
<if expr="RC != 0">
@@ -302,8 +308,14 @@
<testcase name="'ACI: Targetattr: Targetattr Not Equals One Attribute'">
<sequence>
<call function="'testCase_Preamble'"/>
+
+ <script>
+ curr_aci_ldif_file = '%s/aci/aci_targetattr/add_aci2.ldif' % STAGED_DATA_DIR
+ curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ </script>
+
<message>
- 'ACI: Targetattr: Targetattr Not Equals One Attribute, preamble adding aci'
+ 'ACI: Targetattr: Targetattr Not Equals One Attribute, preamble adding aci,\n %s' % curr_aci
</message>
<call function="'modifyEntry'">
@@ -311,7 +323,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetattr/add_aci2.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s' % curr_aci_ldif_file }
</call>
<if expr="RC != 0">
@@ -457,8 +469,14 @@
<testcase name="'ACI: Targetattr: Targetattr Equals Three Attributes'">
<sequence>
<call function="'testCase_Preamble'"/>
+
+ <script>
+ curr_aci_ldif_file = '%s/aci/aci_targetattr/add_aci3.ldif' % STAGED_DATA_DIR
+ curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ </script>
+
<message>
- 'ACI: Targetattr: Targetattr Equals Three Attributes, preamble adding aci'
+ 'ACI: Targetattr: Targetattr Equals Three Attributes, preamble adding aci,\n %s' % curr_aci
</message>
<call function="'modifyEntry'">
@@ -466,7 +484,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetattr/add_aci3.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s' % curr_aci_ldif_file }
</call>
<if expr="RC != 0">
@@ -631,8 +649,14 @@
<testcase name="'ACI: Targetattr: Targetattr Not Equals Three Attributes'">
<sequence>
<call function="'testCase_Preamble'"/>
+
+ <script>
+ curr_aci_ldif_file = '%s/aci/aci_targetattr/add_aci4.ldif' % STAGED_DATA_DIR
+ curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ </script>
+
<message>
- 'ACI: Targetattr: Targetattr Not Equals Three Attributes, preamble adding aci'
+ 'ACI: Targetattr: Targetattr Not Equals Three Attributes, preamble adding aci,\n %s' % curr_aci
</message>
<call function="'modifyEntry'">
@@ -640,7 +664,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetattr/add_aci4.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s' % curr_aci_ldif_file }
</call>
<if expr="RC != 0">
@@ -800,8 +824,14 @@
<testcase name="'ACI: Targetattr: Bad Targetattr'">
<sequence>
<call function="'testCase_Preamble'"/>
+
+ <script>
+ curr_aci_ldif_file = '%s/aci/aci_targetattr/add_aci5.ldif' % STAGED_DATA_DIR
+ curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ </script>
+
<message>
- 'ACI: Targetattr: Bad Targetattr, preamble adding aci'
+ 'ACI: Targetattr: Bad Targetattr, preamble adding aci,\n %s' % curr_aci
</message>
<call function="'modifyEntry'">
@@ -809,7 +839,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetattr/add_aci5.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s' % curr_aci_ldif_file }
</call>
<if expr="RC != 0">
@@ -940,8 +970,14 @@
<testcase name="'ACI: Targetattr: Multiple Targets'">
<sequence>
<call function="'testCase_Preamble'"/>
+
+ <script>
+ curr_aci_ldif_file = '%s/aci/aci_targetattr/add_aci6.ldif' % STAGED_DATA_DIR
+ curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ </script>
+
<message>
- 'ACI: Targetattr: Multiple Targetattrs - add aci'
+ 'ACI: Targetattr: Multiple Targetattrs - add aci,\n %s' % curr_aci
</message>
<call function="'modifyEntry'">
@@ -949,7 +985,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetattr/add_aci6.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s' % curr_aci_ldif_file }
</call>
<if expr="RC != 21">
@@ -1000,8 +1036,14 @@
<testcase name="'ACI: Targetattr: Keyword Targetattr Mispelled'">
<sequence>
<call function="'testCase_Preamble'"/>
+
+ <script>
+ curr_aci_ldif_file = '%s/aci/aci_targetattr/add_aci7.ldif' % STAGED_DATA_DIR
+ curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ </script>
+
<message>
- 'ACI: Targetattr: Keyword Targetattr Mispelled - add aci'
+ 'ACI: Targetattr: Keyword Targetattr Mispelled - add aci,\n %s' % curr_aci
</message>
<call function="'modifyEntry'">
@@ -1009,7 +1051,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetattr/add_aci7.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s' % curr_aci_ldif_file }
</call>
<if expr="RC != 21">
@@ -1060,8 +1102,14 @@
<testcase name="'ACI: Targetattr: Targetattr With Missing Quotes'">
<sequence>
<call function="'testCase_Preamble'"/>
+
+ <script>
+ curr_aci_ldif_file = '%s/aci/aci_targetattr/add_aci8.ldif' % STAGED_DATA_DIR
+ curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ </script>
+
<message>
- 'ACI: Targetattr: Targetattr With Missing Quotes - add aci'
+ 'ACI: Targetattr: Targetattr With Missing Quotes - add aci,\n %s' % curr_aci
</message>
<call function="'modifyEntry'">
@@ -1069,7 +1117,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetattr/add_aci8.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s' % curr_aci_ldif_file }
</call>
<if expr="RC != 21">
@@ -1125,8 +1173,14 @@
<testcase name="'ACI: Targetattr: Targetattr With Spaces'">
<sequence>
<call function="'testCase_Preamble'"/>
+
+ <script>
+ curr_aci_ldif_file = '%s/aci/aci_targetattr/add_aci9.ldif' % STAGED_DATA_DIR
+ curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ </script>
+
<message>
- 'ACI: Targetattr: Targetattr With Spaces, preamble adding aci'
+ 'ACI: Targetattr: Targetattr With Spaces, preamble adding aci,\n %s' % curr_aci
</message>
<call function="'modifyEntry'">
@@ -1134,7 +1188,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetattr/add_aci9.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s' % curr_aci_ldif_file }
</call>
<if expr="RC != 0">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml
index 09c8fb6..cde7676 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml
@@ -148,8 +148,14 @@
<testcase name="'ACI: Targetfilter: Targetfilter Equals One Statement'">
<sequence>
<call function="'testCase_Preamble'"/>
+
+ <script>
+ curr_aci_ldif_file = '%s/aci/aci_targetfilter/add_aci1.ldif' % STAGED_DATA_DIR
+ curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ </script>
+
<message>
- 'ACI: Targetfilter: Targetfilter Equals One Statement, preamble adding aci'
+ 'ACI: Targetfilter: Targetfilter Equals One Statement, preamble adding aci,\n %s' % curr_aci
</message>
<call function="'modifyEntry'">
@@ -157,7 +163,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/add_aci1.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s' % curr_aci_ldif_file }
</call>
<if expr="RC != 0">
@@ -281,7 +287,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % STAGED_DATA_DIR }
</call>
<if expr="RC != 0">
@@ -341,8 +347,14 @@
<testcase name="'ACI: Targetfilter: Targetfilter Equals One Statement 2'">
<sequence>
<call function="'testCase_Preamble'"/>
+
+ <script>
+ curr_aci_ldif_file = '%s/aci/aci_targetfilter/add_aci1.ldif' % STAGED_DATA_DIR
+ curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ </script>
+
<message>
- 'ACI: Targetfilter: Targetfilter Equals One Statement 2, preamble adding aci'
+ 'ACI: Targetfilter: Targetfilter Equals One Statement 2, preamble adding aci,\n %s' % curr_aci
</message>
<call function="'modifyEntry'">
@@ -350,7 +362,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/add_aci1.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s' % curr_aci_ldif_file }
</call>
<if expr="RC != 0">
@@ -474,7 +486,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % STAGED_DATA_DIR }
</call>
<if expr="RC != 0">
@@ -532,8 +544,14 @@
<testcase name="'ACI: Targetfilter: Targetfilter Equals One Statement 3'">
<sequence>
<call function="'testCase_Preamble'"/>
+
+ <script>
+ curr_aci_ldif_file = '%s/aci/aci_targetfilter/add_aci1.ldif' % STAGED_DATA_DIR
+ curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ </script>
+
<message>
- 'ACI: Targetfilter: Targetfilter Equals One Statement 3, preamble adding aci'
+ 'ACI: Targetfilter: Targetfilter Equals One Statement 3, preamble adding aci,\n %s' % curr_aci
</message>
<call function="'modifyEntry'">
@@ -541,7 +559,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/add_aci1.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s' % curr_aci_ldif_file }
</call>
<if expr="RC != 0">
@@ -636,7 +654,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % STAGED_DATA_DIR }
</call>
<if expr="RC != 0">
@@ -694,8 +712,14 @@
<testcase name="'ACI: Targetfilter: Targetfilter Not Equals One Statement'">
<sequence>
<call function="'testCase_Preamble'"/>
+
+ <script>
+ curr_aci_ldif_file = '%s/aci/aci_targetfilter/add_aci2.ldif' % STAGED_DATA_DIR
+ curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ </script>
+
<message>
- 'ACI: Targetfilter: Targetfilter Not Equals One Statement, preamble adding aci'
+ 'ACI: Targetfilter: Targetfilter Not Equals One Statement, preamble adding aci,\n %s' % curr_aci
</message>
<call function="'modifyEntry'">
@@ -703,7 +727,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/add_aci2.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s' % curr_aci_ldif_file }
</call>
<if expr="RC != 0">
@@ -827,7 +851,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % STAGED_DATA_DIR }
</call>
<if expr="RC != 0">
@@ -886,8 +910,14 @@
<testcase name="'ACI: Targetfilter: Targetfilter Equals Three Statements With or, one true'">
<sequence>
<call function="'testCase_Preamble'"/>
+
+ <script>
+ curr_aci_ldif_file = '%s/aci/aci_targetfilter/add_aci3.ldif' % STAGED_DATA_DIR
+ curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ </script>
+
<message>
- 'ACI: Targetfilter: Targetfilter Equals Three Statements With or, one true, preamble adding aci'
+ 'ACI: Targetfilter: Targetfilter Equals Three Statements With or, one true, preamble adding aci,\n %s' % curr_aci
</message>
<call function="'modifyEntry'">
@@ -895,7 +925,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/add_aci3.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s' % curr_aci_ldif_file }
</call>
<if expr="RC != 0">
@@ -1019,7 +1049,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % STAGED_DATA_DIR }
</call>
<if expr="RC != 0">
@@ -1078,8 +1108,14 @@
<testcase name="'ACI: Targetfilter: Targetfilter Not Equals Three Statements With or, one true'">
<sequence>
<call function="'testCase_Preamble'"/>
+
+ <script>
+ curr_aci_ldif_file = '%s/aci/aci_targetfilter/add_aci3a.ldif' % STAGED_DATA_DIR
+ curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ </script>
+
<message>
- 'ACI: Targetfilter: Targetfilter Not Equals Three Statements With or, one true, preamble adding aci'
+ 'ACI: Targetfilter: Targetfilter Not Equals Three Statements With or, one true, preamble adding aci,\n %s' % curr_aci
</message>
<call function="'modifyEntry'">
@@ -1087,7 +1123,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/add_aci3a.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s' % curr_aci_ldif_file }
</call>
<if expr="RC != 0">
@@ -1211,7 +1247,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % STAGED_DATA_DIR }
</call>
<if expr="RC != 0">
@@ -1268,8 +1304,14 @@
<testcase name="'ACI: Targetfilter: Targetfilter Equals Three Statements With or, none true'">
<sequence>
<call function="'testCase_Preamble'"/>
+
+ <script>
+ curr_aci_ldif_file = '%s/aci/aci_targetfilter/add_aci4.ldif' % STAGED_DATA_DIR
+ curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ </script>
+
<message>
- 'ACI: Targetfilter: Targetfilter Equals Three Statements With or, none true, preamble adding aci'
+ 'ACI: Targetfilter: Targetfilter Equals Three Statements With or, none true, preamble adding aci,\n %s' % curr_aci
</message>
<call function="'modifyEntry'">
@@ -1277,7 +1319,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/add_aci4.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s' % curr_aci_ldif_file }
</call>
<if expr="RC != 0">
@@ -1347,7 +1389,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % STAGED_DATA_DIR }
</call>
<if expr="RC != 0">
@@ -1405,8 +1447,14 @@
<testcase name="'ACI: Targetfilter: Targetfilter Equals Three Statements With and, one true'">
<sequence>
<call function="'testCase_Preamble'"/>
+
+ <script>
+ curr_aci_ldif_file = '%s/aci/aci_targetfilter/add_aci5.ldif' % STAGED_DATA_DIR
+ curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ </script>
+
<message>
- 'ACI: Targetfilter: Targetfilter Equals Three Statements With and, one true, preamble adding aci'
+ 'ACI: Targetfilter: Targetfilter Equals Three Statements With and, one true, preamble adding aci,\n %s' % curr_aci
</message>
<call function="'modifyEntry'">
@@ -1414,7 +1462,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/add_aci5.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s' % curr_aci_ldif_file }
</call>
<if expr="RC != 0">
@@ -1484,7 +1532,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % STAGED_DATA_DIR }
</call>
<if expr="RC != 0">
@@ -1543,8 +1591,14 @@
<testcase name="'ACI: Targetfilter: Targetfilter Equals Three Statements With and, all true'">
<sequence>
<call function="'testCase_Preamble'"/>
+
+ <script>
+ curr_aci_ldif_file = '%s/aci/aci_targetfilter/add_aci6.ldif' % STAGED_DATA_DIR
+ curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ </script>
+
<message>
- 'ACI: Targetfilter: Targetfilter Equals Three Statements With and, all true, preamble adding aci'
+ 'ACI: Targetfilter: Targetfilter Equals Three Statements With and, all true, preamble adding aci,\n %s' % curr_aci
</message>
<call function="'modifyEntry'">
@@ -1552,7 +1606,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/add_aci6.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s' % curr_aci_ldif_file }
</call>
<if expr="RC != 0">
@@ -1676,7 +1730,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % STAGED_DATA_DIR }
</call>
<if expr="RC != 0">
@@ -1735,8 +1789,14 @@
<testcase name="'ACI: Targetfilter: Targetfilter Not Equals Three Statements With and, all true'">
<sequence>
<call function="'testCase_Preamble'"/>
+
+ <script>
+ curr_aci_ldif_file = '%s/aci/aci_targetfilter/add_aci6a.ldif' % STAGED_DATA_DIR
+ curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ </script>
+
<message>
- 'ACI: Targetfilter: Targetfilter Not Equals Three Statements With and, all true, preamble adding aci'
+ 'ACI: Targetfilter: Targetfilter Not Equals Three Statements With and, all true, preamble adding aci,\n %s' % curr_aci
</message>
<call function="'modifyEntry'">
@@ -1744,7 +1804,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/add_aci6a.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s' % curr_aci_ldif_file }
</call>
<if expr="RC != 0">
@@ -1868,7 +1928,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % STAGED_DATA_DIR }
</call>
<if expr="RC != 0">
@@ -1927,8 +1987,14 @@
<testcase name="'ACI: Targetfilter: Targetfilter Equals Three Statements With Wildcard and or, one true'">
<sequence>
<call function="'testCase_Preamble'"/>
+
+ <script>
+ curr_aci_ldif_file = '%s/aci/aci_targetfilter/add_aci10.ldif' % STAGED_DATA_DIR
+ curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ </script>
+
<message>
- 'ACI: Targetfilter: Targetfilter Equals Three Statements With Wildcard and or, one true, preamble adding aci'
+ 'ACI: Targetfilter: Targetfilter Equals Three Statements With Wildcard and or, one true, preamble adding aci,\n %s' % curr_aci
</message>
<call function="'modifyEntry'">
@@ -1936,7 +2002,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/add_aci10.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s' % curr_aci_ldif_file }
</call>
<if expr="RC != 0">
@@ -2060,7 +2126,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % STAGED_DATA_DIR }
</call>
<if expr="RC != 0">
@@ -2119,8 +2185,14 @@
<testcase name="'ACI: Targetfilter: Targetfilter Equals Three Statements With Two Wildcards and or, one true'">
<sequence>
<call function="'testCase_Preamble'"/>
+
+ <script>
+ curr_aci_ldif_file = '%s/aci/aci_targetfilter/add_aci11.ldif' % STAGED_DATA_DIR
+ curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ </script>
+
<message>
- 'ACI: Targetfilter: Targetfilter Equals Three Statements With Two Wildcards and or, one true, preamble adding aci'
+ 'ACI: Targetfilter: Targetfilter Equals Three Statements With Two Wildcards and or, one true, preamble adding aci,\n %s' % curr_aci
</message>
<call function="'modifyEntry'">
@@ -2128,7 +2200,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/add_aci11.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s' % curr_aci_ldif_file }
</call>
<if expr="RC != 0">
@@ -2252,7 +2324,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % STAGED_DATA_DIR }
</call>
<if expr="RC != 0">
@@ -2311,8 +2383,14 @@
<testcase name="'ACI: Targetfilter: Targetfilter Equals Three Statements With Wildcard With and, all true'">
<sequence>
<call function="'testCase_Preamble'"/>
+
+ <script>
+ curr_aci_ldif_file = '%s/aci/aci_targetfilter/add_aci12.ldif' % STAGED_DATA_DIR
+ curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ </script>
+
<message>
- 'ACI: Targetfilter: Targetfilter Equals Three Statements With Wildcard With and, all true, preamble adding aci'
+ 'ACI: Targetfilter: Targetfilter Equals Three Statements With Wildcard With and, all true, preamble adding aci,\n %s' % curr_aci
</message>
<call function="'modifyEntry'">
@@ -2320,7 +2398,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/add_aci12.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s' % curr_aci_ldif_file }
</call>
<if expr="RC != 0">
@@ -2444,7 +2522,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % STAGED_DATA_DIR }
</call>
<if expr="RC != 0">
@@ -2503,8 +2581,14 @@
<testcase name="'ACI: Targetfilter: Targetfilter Equals Three Statements With Three Wildcards With and, all true'">
<sequence>
<call function="'testCase_Preamble'"/>
+
+ <script>
+ curr_aci_ldif_file = '%s/aci/aci_targetfilter/add_aci13.ldif' % STAGED_DATA_DIR
+ curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ </script>
+
<message>
- 'ACI: Targetfilter: Targetfilter Equals Three Statements With Three Wildcards With and, all true, preamble adding aci'
+ 'ACI: Targetfilter: Targetfilter Equals Three Statements With Three Wildcards With and, all true, preamble adding aci,\n %s' % curr_aci
</message>
<call function="'modifyEntry'">
@@ -2512,7 +2596,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/add_aci13.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s' % curr_aci_ldif_file }
</call>
<if expr="RC != 0">
@@ -2636,7 +2720,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % STAGED_DATA_DIR }
</call>
<if expr="RC != 0">
@@ -2692,8 +2776,14 @@
<testcase name="'ACI: Targetfilter: Targetfilter With Extra Spaces'">
<sequence>
<call function="'testCase_Preamble'"/>
+
+ <script>
+ curr_aci_ldif_file = '%s/aci/aci_targetfilter/add_aci7.ldif' % STAGED_DATA_DIR
+ curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ </script>
+
<message>
- 'ACI: Targetfilter: Targetfilter With Extra Spaces, preamble adding aci'
+ 'ACI: Targetfilter: Targetfilter With Extra Spaces, preamble adding aci,\n %s' % curr_aci
</message>
<call function="'modifyEntry'">
@@ -2701,7 +2791,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/add_aci7.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s' % curr_aci_ldif_file }
</call>
<if expr="RC != 0">
@@ -2744,7 +2834,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % STAGED_DATA_DIR }
</call>
<if expr="RC != 0">
@@ -2798,8 +2888,14 @@
<testcase name="'ACI: Targetfilter: Targetfilter With Missing Quotes'">
<sequence>
<call function="'testCase_Preamble'"/>
+
+ <script>
+ curr_aci_ldif_file = '%s/aci/aci_targetfilter/add_aci8.ldif' % STAGED_DATA_DIR
+ curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ </script>
+
<message>
- 'ACI: Targetfilter: Targetfilter With Missing Quotes, preamble adding aci'
+ 'ACI: Targetfilter: Targetfilter With Missing Quotes, preamble adding aci,\n %s' % curr_aci
</message>
<call function="'modifyEntry'">
@@ -2807,7 +2903,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/add_aci8.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s' % curr_aci_ldif_file }
</call>
<if expr="RC != 21">
@@ -2861,8 +2957,14 @@
<testcase name="'ACI: Targetfilter: Targetfilter With Missing Quotes 2'">
<sequence>
<call function="'testCase_Preamble'"/>
+
+ <script>
+ curr_aci_ldif_file = '%s/aci/aci_targetfilter/add_aci9.ldif' % STAGED_DATA_DIR
+ curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ </script>
+
<message>
- 'ACI: Targetfilter: Targetfilter With Missing Quotes 2, preamble adding aci'
+ 'ACI: Targetfilter: Targetfilter With Missing Quotes 2, preamble adding aci,\n %s' % curr_aci
</message>
<call function="'modifyEntry'">
@@ -2870,7 +2972,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/add_aci9.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s' % curr_aci_ldif_file }
</call>
<if expr="RC != 21">
--
Gitblit v1.10.0