From 123bfa9d69636d53e24660b5dbd4c62c6172e257 Mon Sep 17 00:00:00 2001
From: andrug <andrug@localhost>
Date: Fri, 06 Jul 2007 15:30:18 +0000
Subject: [PATCH] WS modification
---
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci15.xml | 40
opends/tests/functional-tests/testcases/aci/aci_add_entry.xml | 326 +---
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci1.xml | 16
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci6.xml | 48
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci24.xml | 56
opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml | 32
opends/tests/functional-tests/testcases/aci/aci_import.xml | 8
opends/tests/functional-tests/testcases/aci/aci_target.xml | 66
opends/tests/functional-tests/testcases/aci/aci_targetattr.xml | 40
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci2.xml | 50
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci22.xml | 48
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci16.xml | 72
opends/tests/functional-tests/testcases/aci/aci_targattrfilter.xml | 278 +--
opends/tests/functional-tests/testcases/aci/aci_rdn_wildcards.xml | 40
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci25.xml | 16
opends/tests/functional-tests/testcases/aci/aci_modify_rdn.xml | 362 ++---
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci21.xml | 16
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci13.xml | 24
opends/tests/functional-tests/testcases/aci/aci_bindtypes.xml | 76
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci12.xml | 72
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci26.xml | 48
opends/tests/functional-tests/testcases/aci/aci_compare_tests.xml | 290 +---
opends/tests/functional-tests/testcases/aci/global_acis.xml | 45
opends/tests/functional-tests/testcases/aci/aci_targetscope.xml | 30
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci11.xml | 40
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci14.xml | 80
opends/tests/functional-tests/testcases/aci/aci_modify_entry.xml | 686 +++-------
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci5.xml | 16
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci4.xml | 56
opends/tests/functional-tests/testcases/aci/multiple_aci_tests.xml | 274 +--
opends/tests/functional-tests/testcases/aci/aci_teardown.xml | 9
opends/tests/functional-tests/testcases/aci/aci_delete_entry.xml | 410 ++----
32 files changed, 1,278 insertions(+), 2,392 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/aci/aci_add_entry.xml b/opends/tests/functional-tests/testcases/aci/aci_add_entry.xml
index 75039d0..5f02e75 100644
--- a/opends/tests/functional-tests/testcases/aci/aci_add_entry.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_add_entry.xml
@@ -188,13 +188,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_allow-add_entry1a.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_allow-add_entry1a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - userdn equals all, admin deleting aci'
</message>
@@ -220,13 +218,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -323,13 +317,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=buser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - userdn equals a dn, user adding entry in non-targeted branch'
</message>
@@ -339,13 +331,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_allow-add_entry2a.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_allow-add_entry2a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - userdn equals a dn, admin deleting aci'
</message>
@@ -371,13 +361,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -475,13 +461,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=buser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - userdn not equals a dn, user adding entry in non-targeted branch'
</message>
@@ -491,13 +475,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_allow-add_entry3a.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_allow-add_entry3a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - userdn not equals a dn, admin deleting aci'
</message>
@@ -523,13 +505,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -589,13 +567,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_allow-delete_entry1.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_allow-delete_entry1.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - userdn not equals a dn, admin deleting aci'
</message>
@@ -621,13 +597,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -724,13 +696,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_targetfilter_entry1a.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_targetfilter_entry1a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - targetfilter equals one statement, admin deleting aci'
</message>
@@ -756,13 +726,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -823,13 +789,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_targetfilter_entry2.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_targetfilter_entry2.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - targetfilter with non-existent attribute, user adding entry in non-targeted branch'
</message>
@@ -839,13 +803,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_targetfilter_entry2a.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_targetfilter_entry2a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - targetfilter with non-existent attribute, admin deleting aci'
</message>
@@ -871,13 +833,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -975,13 +933,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_targetattr_entry1a.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_targetattr_entry1a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - targetattr with one attribute, admin deleting aci'
</message>
@@ -1007,13 +963,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1110,13 +1062,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_targattrfilter_entry1a.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_targattrfilter_entry1a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - targattrfilter with add:,del:, admin deleting aci'
</message>
@@ -1142,13 +1092,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1244,13 +1190,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_targattrfilter_entry2a.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_targattrfilter_entry2a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - targattrfilter with add: only, admin deleting aci'
</message>
@@ -1276,13 +1220,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1343,13 +1283,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_targattrfilter_entry3.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_targattrfilter_entry3.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - targattrfilter with add: statement false, user adding entry in non-targeted branch'
</message>
@@ -1359,13 +1297,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_targattrfilter_entry3a.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_targattrfilter_entry3a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - targattrfilter with add: statement false, admin deleting aci'
</message>
@@ -1391,13 +1327,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1459,13 +1391,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_multi_aci_entry1.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_multi_aci_entry1.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - Multi ACIs 1, user adding entry in non-targeted branch'
</message>
@@ -1475,13 +1405,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_multi_aci_entry1a.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_multi_aci_entry1a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - Multi ACIs 1, admin deleting aci'
</message>
@@ -1507,13 +1435,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1591,13 +1515,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_multi_aci_entry2a.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_multi_aci_entry2a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - Multi ACIs 2, admin deleting aci'
</message>
@@ -1623,13 +1545,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1708,13 +1626,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=buser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - Multi ACIs 3, user adding entry in non-targeted branch'
</message>
@@ -1724,13 +1640,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_multi_aci_entry3a.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_multi_aci_entry3a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - Multi ACIs 3, admin deleting aci'
</message>
@@ -1756,13 +1670,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1840,13 +1750,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_multi_aci_entry4a.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_multi_aci_entry4a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - Multi ACIs 4, admin deleting aci'
</message>
@@ -1872,13 +1780,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1957,13 +1861,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=buser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - Multi ACIs 5, user adding entry in non-targeted branch'
</message>
@@ -1973,13 +1875,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_multi_aci_entry5a.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_multi_aci_entry5a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - Multi ACIs 5, admin deleting aci'
</message>
@@ -2005,13 +1905,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeAdded' : '%s/aci/aci_add_entry/add_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_bindtypes.xml b/opends/tests/functional-tests/testcases/aci/aci_bindtypes.xml
index 2f2fe9e..c5dab95 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_bindtypes.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_bindtypes.xml
@@ -2791,13 +2791,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=zuser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/replace_member_static3.ldif' % (logsRemoteDataDir) }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/replace_member_static3.ldif' % (logsRemoteDataDir) ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: groupdn - selfwrite replace member, admin deleting selfwrite aci'
</message>
@@ -2968,13 +2966,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=zuser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/add_new_description_static4.ldif' % (logsRemoteDataDir) }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/add_new_description_static4.ldif' % (logsRemoteDataDir) ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: groupdn - selfwrite add description, admin deleting selfwrite aci'
</message>
@@ -5061,13 +5057,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 21 }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'expectedRC' : 21
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -5105,13 +5097,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 21 }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'expectedRC' : 21
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -5149,13 +5137,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 21 }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'expectedRC' : 21
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -5193,13 +5177,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 21 }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'expectedRC' : 21
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -5237,13 +5217,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 21 }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'expectedRC' : 21
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -5281,15 +5257,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'expectedRC' : 21
+ }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 21 }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_compare_tests.xml b/opends/tests/functional-tests/testcases/aci/aci_compare_tests.xml
index ad53ccf..9a49689 100644
--- a/opends/tests/functional-tests/testcases/aci/aci_compare_tests.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_compare_tests.xml
@@ -181,13 +181,11 @@
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'attrToBeCompared' : 'l:Santa Clara',
- 'entryToBeCompared' : 'uid=tclow, ou=People, ou=non-aci branch, o=ACI Tests, dc=example,dc=com' }
+ 'entryToBeCompared' : 'uid=tclow, ou=People, ou=non-aci branch, o=ACI Tests, dc=example,dc=com' ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - userdn equals all, admin deleting aci'
</message>
@@ -214,15 +212,11 @@
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'attrToBeCompared' : 'l:Cupertino',
- 'entryToBeCompared' : 'uid=jreuter, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' }
+ 'entryToBeCompared' : 'uid=jreuter, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' ,
+ 'expectedRC' : 50
+ }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -311,13 +305,11 @@
'dsInstanceDn' : 'uid=buser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'attrToBeCompared' : 'l:Santa Clara',
- 'entryToBeCompared' : 'uid=tclow, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' }
+ 'entryToBeCompared' : 'uid=tclow, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - userdn not equals a dn, user comparing attribute in non-targeted branch'
</message>
@@ -328,13 +320,11 @@
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'attrToBeCompared' : 'l:Santa Clara',
- 'entryToBeCompared' : 'uid=tclow, ou=People, ou=non-aci branch, o=ACI Tests, dc=example,dc=com' }
+ 'entryToBeCompared' : 'uid=tclow, ou=People, ou=non-aci branch, o=ACI Tests, dc=example,dc=com' ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - userdn not equals a dn, admin deleting aci'
</message>
@@ -361,13 +351,9 @@
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'attrToBeCompared' : 'l:Cupertino',
- 'entryToBeCompared' : 'uid=jreuter, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeCompared' : 'uid=jreuter, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -430,13 +416,11 @@
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'attrToBeCompared' : 'l:Santa Clara',
- 'entryToBeCompared' : 'uid=tclow, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' }
+ 'entryToBeCompared' : 'uid=tclow, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - userdn equals a branch dn, user comparing attribute in targeted branch'
</message>
@@ -447,13 +431,11 @@
'dsInstanceDn' : 'uid=buser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'attrToBeCompared' : 'l:Santa Clara',
- 'entryToBeCompared' : 'uid=tclow, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' }
+ 'entryToBeCompared' : 'uid=tclow, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - userdn equals a branch dn, user comparing attribute in non-targeted branch'
</message>
@@ -464,13 +446,11 @@
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'attrToBeCompared' : 'l:Santa Clara',
- 'entryToBeCompared' : 'uid=tclow, ou=People, ou=non-aci branch, o=ACI Tests, dc=example,dc=com' }
+ 'entryToBeCompared' : 'uid=tclow, ou=People, ou=non-aci branch, o=ACI Tests, dc=example,dc=com' ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - userdn equals a branch dn, admin deleting aci'
</message>
@@ -497,13 +477,9 @@
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'attrToBeCompared' : 'l:Cupertino',
- 'entryToBeCompared' : 'uid=jreuter, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeCompared' : 'uid=jreuter, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -620,13 +596,11 @@
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'attrToBeCompared' : 'l:Santa Clara',
- 'entryToBeCompared' : 'uid=tclow, ou=People, ou=non-aci branch, o=ACI Tests, dc=example,dc=com' }
+ 'entryToBeCompared' : 'uid=tclow, ou=People, ou=non-aci branch, o=ACI Tests, dc=example,dc=com' ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - userdn not equals a branch dn, admin deleting aci'
</message>
@@ -653,13 +627,9 @@
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'attrToBeCompared' : 'l:Cupertino',
- 'entryToBeCompared' : 'uid=jreuter, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeCompared' : 'uid=jreuter, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -776,13 +746,11 @@
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'attrToBeCompared' : 'l:Santa Clara',
- 'entryToBeCompared' : 'uid=tclow, ou=People, ou=non-aci branch, o=ACI Tests, dc=example,dc=com' }
+ 'entryToBeCompared' : 'uid=tclow, ou=People, ou=non-aci branch, o=ACI Tests, dc=example,dc=com' ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - userdn equals two dns, admin deleting aci'
</message>
@@ -809,13 +777,9 @@
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'attrToBeCompared' : 'l:Cupertino',
- 'entryToBeCompared' : 'uid=jreuter, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeCompared' : 'uid=jreuter, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -878,13 +842,11 @@
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'attrToBeCompared' : 'l:Santa Clara',
- 'entryToBeCompared' : 'uid=tclow, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' }
+ 'entryToBeCompared' : 'uid=tclow, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - userdn not equals two dns, user comparing attribute in targeted branch'
</message>
@@ -895,13 +857,11 @@
'dsInstanceDn' : 'uid=buser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'attrToBeCompared' : 'l:Santa Clara',
- 'entryToBeCompared' : 'uid=tclow, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' }
+ 'entryToBeCompared' : 'uid=tclow, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - userdn not equals two dns, user comparing attribute in non-targeted branch'
</message>
@@ -912,13 +872,11 @@
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'attrToBeCompared' : 'l:Santa Clara',
- 'entryToBeCompared' : 'uid=tclow, ou=People, ou=non-aci branch, o=ACI Tests, dc=example,dc=com' }
+ 'entryToBeCompared' : 'uid=tclow, ou=People, ou=non-aci branch, o=ACI Tests, dc=example,dc=com' ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - userdn not equals two dns, admin deleting aci'
</message>
@@ -945,13 +903,9 @@
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'attrToBeCompared' : 'l:Cupertino',
- 'entryToBeCompared' : 'uid=jreuter, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeCompared' : 'uid=jreuter, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1012,13 +966,11 @@
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'attrToBeCompared' : 'l:Santa Clara',
- 'entryToBeCompared' : 'uid=tclow, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' }
+ 'entryToBeCompared' : 'uid=tclow, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - userdn compare not allowed, user comparing attribute in non-targeted branch'
</message>
@@ -1029,13 +981,11 @@
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'attrToBeCompared' : 'l:Santa Clara',
- 'entryToBeCompared' : 'uid=tclow, ou=People, ou=non-aci branch, o=ACI Tests, dc=example,dc=com' }
+ 'entryToBeCompared' : 'uid=tclow, ou=People, ou=non-aci branch, o=ACI Tests, dc=example,dc=com' ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - userdn compare not allowed, admin deleting aci'
</message>
@@ -1062,13 +1012,9 @@
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'attrToBeCompared' : 'l:Cupertino',
- 'entryToBeCompared' : 'uid=jreuter, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeCompared' : 'uid=jreuter, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1159,13 +1105,11 @@
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'attrToBeCompared' : 'roomnumber:4376',
- 'entryToBeCompared' : 'uid=tclow, ou=People, ou=non-aci branch, o=ACI Tests, dc=example,dc=com' }
+ 'entryToBeCompared' : 'uid=tclow, ou=People, ou=non-aci branch, o=ACI Tests, dc=example,dc=com' ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - targetattr with one attribute, user comparing attribute in non-targeted branch'
</message>
@@ -1176,13 +1120,11 @@
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'attrToBeCompared' : 'l:Santa Clara',
- 'entryToBeCompared' : 'uid=tclow, ou=People, ou=non-aci branch, o=ACI Tests, dc=example,dc=com' }
+ 'entryToBeCompared' : 'uid=tclow, ou=People, ou=non-aci branch, o=ACI Tests, dc=example,dc=com' ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - targetattr with one attribute, admin deleting aci'
</message>
@@ -1209,13 +1151,9 @@
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'attrToBeCompared' : 'l:Cupertino',
- 'entryToBeCompared' : 'uid=jreuter, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeCompared' : 'uid=jreuter, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1306,13 +1244,11 @@
'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' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - targetfilter with one statement, user comparing attribute in non-targeted branch'
</message>
@@ -1323,13 +1259,11 @@
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'attrToBeCompared' : 'l:Santa Clara',
- 'entryToBeCompared' : 'uid=tclow, ou=People, ou=non-aci branch, o=ACI Tests, dc=example,dc=com' }
+ 'entryToBeCompared' : 'uid=tclow, ou=People, ou=non-aci branch, o=ACI Tests, dc=example,dc=com' ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - targetfilter with one statement, admin deleting aci'
</message>
@@ -1356,13 +1290,9 @@
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'attrToBeCompared' : 'l:Cupertino',
- 'entryToBeCompared' : 'uid=jreuter, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeCompared' : 'uid=jreuter, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1479,13 +1409,11 @@
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'attrToBeCompared' : 'l:Santa Clara',
- 'entryToBeCompared' : 'uid=tclow, ou=People, ou=non-aci branch, o=ACI Tests, dc=example,dc=com' }
+ 'entryToBeCompared' : 'uid=tclow, ou=People, ou=non-aci branch, o=ACI Tests, dc=example,dc=com' ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - targetattrfilter with add:,del:, admin deleting aci'
</message>
@@ -1512,13 +1440,9 @@
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'attrToBeCompared' : 'l:Cupertino',
- 'entryToBeCompared' : 'uid=jreuter, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeCompared' : 'uid=jreuter, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1635,13 +1559,11 @@
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'attrToBeCompared' : 'l:Santa Clara',
- 'entryToBeCompared' : 'uid=tclow, ou=People, ou=non-aci branch, o=ACI Tests, dc=example,dc=com' }
+ 'entryToBeCompared' : 'uid=tclow, ou=People, ou=non-aci branch, o=ACI Tests, dc=example,dc=com' ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - targetattrfilter with add:,del:, returns false, admin deleting aci'
</message>
@@ -1668,13 +1590,9 @@
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'attrToBeCompared' : 'l:Cupertino',
- 'entryToBeCompared' : 'uid=jreuter, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeCompared' : 'uid=jreuter, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1735,13 +1653,11 @@
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'attrToBeCompared' : 'l:Santa Clara',
- 'entryToBeCompared' : 'uid=tclow, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' }
+ 'entryToBeCompared' : 'uid=tclow, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - Multi ACIs 1, overall deny, admin deleting aci'
</message>
@@ -1768,13 +1684,9 @@
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'attrToBeCompared' : 'l:Cupertino',
- 'entryToBeCompared' : 'uid=jreuter, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeCompared' : 'uid=jreuter, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1879,13 +1791,9 @@
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'attrToBeCompared' : 'l:Cupertino',
- 'entryToBeCompared' : 'uid=jreuter, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeCompared' : 'uid=jreuter, ou=People, ou=aci branch, o=ACI Tests, dc=example,dc=com' ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_delete_entry.xml b/opends/tests/functional-tests/testcases/aci/aci_delete_entry.xml
index dee6fce..7558c3b 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_delete_entry.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_delete_entry.xml
@@ -211,13 +211,11 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'uid=bhall,ou=People,ou=aci branch,o=Delete Tests,o=ACI Tests,dc=example,dc=com' ,
- 'dsFilter' : 'objectclass=*' }
+ 'dsFilter' : 'objectclass=*' ,
+ 'expectedRC' : 32
+ }
</call>
- <if expr="RC != 32">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - userdn equals all, user deleting entry from non-targeted branch'
</message>
@@ -227,13 +225,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_allow-delete_entry1a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_allow-delete_entry1a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - userdn equals all, admin deleting aci'
</message>
@@ -259,13 +255,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -347,13 +339,11 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'uid=tmason,ou=People,ou=aci branch,o=Delete Tests,o=ACI Tests,dc=example,dc=com' ,
- 'dsFilter' : 'objectclass=*' }
+ 'dsFilter' : 'objectclass=*' ,
+ 'expectedRC' : 32
+ }
</call>
- <if expr="RC != 32">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - userdn equals a dn, user deleting entry from targeted branch with prohibited userdn'
</message>
@@ -363,13 +353,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=buser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - userdn equals a dn, user deleting entry from non-targeted branch'
</message>
@@ -379,13 +367,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_allow-delete_entry2a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_allow-delete_entry2a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - userdn equals a dn, admin deleting aci'
</message>
@@ -411,13 +397,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -499,12 +481,10 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'uid=jreuter,ou=People,ou=aci branch,o=Delete Tests,o=ACI Tests,dc=example,dc=com' ,
- 'dsFilter' : 'objectclass=*' }
+ 'dsFilter' : 'objectclass=*' ,
+ 'expectedRC' : 32
+ }
</call>
-
- <if expr="RC != 32">
- <tcstatus result="'fail'"/>
- </if>
<message>
'ACI: Delete: Delete Entry - userdn not equals a dn, prohibited user deleting entry from targeted branch'
@@ -515,13 +495,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=buser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_allow-delete_entry3.1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_allow-delete_entry3.1.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - userdn not equals a dn, user deleting entry from non-targeted branch'
</message>
@@ -531,13 +509,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_allow-delete_entry3a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_allow-delete_entry3a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - userdn not equals a dn, admin deleting aci'
</message>
@@ -563,13 +539,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -630,13 +602,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_allow-write_entry1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_allow-write_entry1.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - delete not allowed, admin deleting aci'
</message>
@@ -662,13 +632,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -749,12 +715,10 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'uid=rdaugherty,ou=People,ou=aci branch,o=Delete Tests,o=ACI Tests,dc=example,dc=com' ,
- 'dsFilter' : 'objectclass=*' }
+ 'dsFilter' : 'objectclass=*' ,
+ 'expectedRC' : 32
+ }
</call>
-
- <if expr="RC != 32">
- <tcstatus result="'fail'"/>
- </if>
<message>
'ACI: Delete: Delete Entry - targetfilter equals one statement, user deleting entry from non-targeted branch'
@@ -765,13 +729,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetfilter_entry1a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetfilter_entry1a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - targetfilter equals one statement, admin deleting aci'
</message>
@@ -797,13 +759,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -864,13 +822,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetfilter_entry2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetfilter_entry2.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - targetfilter equals three statements (or) all false, user deleting entry from non-targeted branch'
</message>
@@ -880,13 +836,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetfilter_entry2a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetfilter_entry2a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - targetfilter equals three statements (or) all false, admin deleting aci'
</message>
@@ -912,13 +866,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -996,13 +946,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetfilter_entry3a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetfilter_entry3a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - targetfilter not equals three statements (or) all false, admin deleting aci'
</message>
@@ -1028,13 +976,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1112,13 +1056,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetfilter_entry4a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetfilter_entry4a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - targetfilter equals three statements (and) all true, admin deleting aci'
</message>
@@ -1144,13 +1086,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1212,13 +1150,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetfilter_entry5.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetfilter_entry5.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - targetfilter contains attribute not present, user deleting entry from non-targeted branch'
</message>
@@ -1228,13 +1164,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetfilter_entry5a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetfilter_entry5a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - targetfilter contains attribute not present, admin deleting aci'
</message>
@@ -1260,13 +1194,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1346,13 +1276,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetattr_entry1a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetattr_entry1a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - targetfilter equals three attributes, admin deleting aci'
</message>
@@ -1378,13 +1306,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1462,13 +1386,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetattr_entry2a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetattr_entry2a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - targetattr equals attribute not present, admin deleting aci'
</message>
@@ -1494,13 +1416,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1579,13 +1497,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targattrfilter_entry1a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_targattrfilter_entry1a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - targetfilter equals attr value, admin deleting aci'
</message>
@@ -1611,13 +1527,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1697,12 +1609,10 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'ou=extra branch 1, ou=aci branch,o=Delete Tests,o=ACI Tests,dc=example,dc=com' ,
- 'dsFilter' : 'objectclass=*' }
+ 'dsFilter' : 'objectclass=*' ,
+ 'expectedRC' : 32
+ }
</call>
-
- <if expr="RC != 32">
- <tcstatus result="'fail'"/>
- </if>
<message>
'ACI: Delete: Delete Entry - delete branch, user deleting branch from non-targeted branch'
@@ -1714,12 +1624,10 @@
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'dsBaseDN' : 'ou=extra branch 1, ou=non-aci branch, o=Delete Tests, o=ACI Tests,dc=example,dc=com' ,
- 'extraParams' : '-x'}
+ 'extraParams' : '-x',
+ 'expectedRC' : 50
+ }
</call>
-
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
<message>
'ACI: Delete: Delete Entry - delete branch, admin deleting aci'
@@ -1797,13 +1705,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry1.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - multi ACIs 1, user deleting entry from non-targeted branch'
</message>
@@ -1813,13 +1719,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry1a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry1a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - multi ACIs 1, admin deleting aci'
</message>
@@ -1845,13 +1749,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1929,13 +1829,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry2a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry2a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - multi ACIs 2, admin deleting aci'
</message>
@@ -1961,13 +1859,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -2030,13 +1924,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=buser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - multi ACIs 3, user deleting entry from targeted branch'
</message>
@@ -2062,13 +1954,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry3a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry3a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - multi ACIs 3, admin deleting aci'
</message>
@@ -2094,13 +1984,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -2178,13 +2064,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry4a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry4a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - multi ACIs 4, admin deleting aci'
</message>
@@ -2210,13 +2094,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -2279,13 +2159,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=buser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - multi ACIs 5, user deleting entry from targeted branch'
</message>
@@ -2311,13 +2189,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry5a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry5a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - multi ACIs 5, admin deleting aci'
</message>
@@ -2343,13 +2219,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_delete_entry/del_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_import.xml b/opends/tests/functional-tests/testcases/aci/aci_import.xml
index 485f5c0..2d70a70 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_import.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_import.xml
@@ -197,17 +197,15 @@
'dsInstancePswd' : 'ACIRules' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base' ,
+ 'expectedRC' : 49
+ }
</call>
<script>
returnString = STAXResult[0][1]
</script>
- <if expr="RC != 49">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Import Tasks: import-ldif, user adding leave lockdown task'
</message>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_entry.xml b/opends/tests/functional-tests/testcases/aci/aci_modify_entry.xml
index 4f1ce3a..9500320 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_modify_entry.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_modify_entry.xml
@@ -171,13 +171,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_entry1a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_entry1a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - userdn equals all, admin deleting aci'
</message>
@@ -203,13 +201,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -289,13 +283,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_entry2.1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_entry2.1.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - targetattr equals three attributes, user modifying entry from non-targeted branch'
</message>
@@ -305,13 +297,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_entry2a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_entry2a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - targetattr equals three attributes, admin deleting aci'
</message>
@@ -337,13 +327,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -423,13 +409,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_entry3.1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_entry3.1.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
-
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
+
<message>
'ACI: Modify: Modify Attribute Value - targetattr not equals three attributes, user modifying entry from non-targeted branch'
</message>
@@ -439,13 +423,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_entry3a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_entry3a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - targetattr not equals three attributes, admin deleting aci'
</message>
@@ -471,13 +453,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -539,13 +517,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-read_entry4.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-read_entry4.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - write not allowed, user modifying prohibited attr in entry from targeted branch'
</message>
@@ -555,13 +531,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-read_entry4.1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-read_entry4.1.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - write not allowed, user modifying entry from non-targeted branch'
</message>
@@ -571,13 +545,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-read_entry4a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-read_entry4a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - write not allowed, admin deleting aci'
</message>
@@ -603,13 +575,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -691,13 +659,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_entry5.1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_entry5.1.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - targetattr and targattrfilter, user modifying prohibited entry (by targattrfilter) from targeted branch'
</message>
@@ -707,13 +673,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_entry5.2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_entry5.2.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - targetattr and targattrfilter, user modifying prohibited attr (by targetattr) in entry from targeted branch'
</message>
@@ -723,13 +687,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_entry5.3.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_entry5.3.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - targetattr and targattrfilter, user modifying entry from non-targeted branch'
</message>
@@ -739,13 +701,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_entry5a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_entry5a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - targetattr and targattrfilter, overall allow, admin deleting aci'
</message>
@@ -771,13 +731,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -856,13 +812,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_entry6.1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_entry6.1.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - targetfilter with three statements with or, one statement true, user modifying entry from non-targeted branch'
</message>
@@ -872,13 +826,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_entry6a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_entry6a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - targetfilter with three statements with or, one statement true, admin deleting aci'
</message>
@@ -904,13 +856,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -989,13 +937,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_entry7.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_entry7.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - targetfilter not equals three statements with and, all statements true , user modifying entry from non-targeted branch'
</message>
@@ -1005,13 +951,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_entry7a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_entry7a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - targetfilter not equals three statements with and, all statements true , admin deleting aci'
</message>
@@ -1037,13 +981,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1105,13 +1045,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_multi_acis_entry8.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_multi_acis_entry8.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - multiple ACIs 1, user modifying entry from non-targeted branch'
</message>
@@ -1121,13 +1059,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_multi_acis_entry8a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_multi_acis_entry8a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - multiple ACIs 1, admin deleting aci'
</message>
@@ -1153,13 +1089,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1237,13 +1169,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_multi_acis_entry9a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_multi_acis_entry9a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - multiple ACIs 2, admin deleting aci'
</message>
@@ -1269,13 +1199,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1338,13 +1264,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=buser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_multi_acis_entry10.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_multi_acis_entry10.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - multiple ACIs 3, user modifying entry from targeted branch'
</message>
@@ -1370,13 +1294,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_multi_acis_entry10a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_multi_acis_entry10a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - multiple ACIs 3, admin deleting aci'
</message>
@@ -1402,13 +1324,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1486,13 +1404,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_multi_acis_entry11a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_multi_acis_entry11a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - multiple ACIs 4, admin deleting aci'
</message>
@@ -1518,13 +1434,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1587,13 +1499,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=buser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - multiple ACIs 5, user modifying entry from targeted branch'
</message>
@@ -1619,13 +1529,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_multi_acis_entry12a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_multi_acis_entry12a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - multiple ACIs 5, admin deleting aci'
</message>
@@ -1651,13 +1559,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1721,13 +1625,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=buser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_delete1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_delete1.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Delete Attribute Value - userdn equals dn, user modifying entry from targeted branch'
</message>
@@ -1753,13 +1655,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_delete1a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_delete1a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Delete Attribute Value - userdn equals dn, admin deleting aci'
</message>
@@ -1785,13 +1685,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/del_common_prohibited_attr.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/del_common_prohibited_attr.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1871,13 +1767,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_delete2.1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_delete2.1.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Delete Attribute Value - targetattr equals one attribute, user modifying entry from non-targeted branch'
</message>
@@ -1887,13 +1781,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_delete2a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_delete2a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Delete Attribute Value - targetattr equals one attribute, admin deleting aci'
</message>
@@ -1919,13 +1811,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/del_common_prohibited_attr.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/del_common_prohibited_attr.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -2005,13 +1893,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_delete3.1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_delete3.1.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Delete Attribute Value - targetattr not equals one attribute, user modifying entry from non-targeted branch'
</message>
@@ -2021,13 +1907,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_delete2a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_delete2a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Delete Attribute Value - targetattr not equals one attribute, admin deleting aci'
</message>
@@ -2053,13 +1937,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/del_common_prohibited_attr.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/del_common_prohibited_attr.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -2121,13 +2001,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-read_delete4.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-read_delete4.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Delete Attribute Value - write not allowed, user modifying prohibited attr in entry from targeted branch'
</message>
@@ -2137,13 +2015,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-read_delete4.1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-read_delete4.1.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Delete Attribute Value - write not allowed, user modifying entry from non-targeted branch'
</message>
@@ -2153,13 +2029,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-read_delete4a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-read_delete4a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Delete Attribute Value - write not allowed, admin deleting aci'
</message>
@@ -2185,13 +2059,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/del_common_prohibited_attr.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/del_common_prohibited_attr.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -2304,13 +2174,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_delete5.3.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_delete5.3.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Delete Attribute Value - targetattr and targattrfilter, user modifying entry from non-targeted branch'
</message>
@@ -2320,13 +2188,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_delete5a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_delete5a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Delete Attribute Value - targetattr and targattrfilter, overall allow, admin deleting aci'
</message>
@@ -2352,13 +2218,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/del_common_prohibited_attr.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/del_common_prohibited_attr.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -2419,13 +2281,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_delete6.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_delete6.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Delete Attribute Value - targetfilter with three statements with or, none true, user modifying entry from non-targeted branch'
</message>
@@ -2435,13 +2295,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_delete6a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_delete6a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Delete Attribute Value - targetfilter with three statements with or, none true, admin deleting aci'
</message>
@@ -2467,13 +2325,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/del_common_prohibited_attr.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/del_common_prohibited_attr.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -2534,13 +2388,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_delete7.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_delete7.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Delete Attribute Value - targetfilter equals three statements with and, all statements false, user modifying entry from non-targeted branch'
</message>
@@ -2550,13 +2402,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_delete7a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_delete7a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Delete Attribute Value - targetfilter equals three statements with and, all statements false, admin deleting aci'
</message>
@@ -2582,13 +2432,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/del_common_prohibited_attr.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/del_common_prohibited_attr.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -2652,13 +2498,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=buser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_add1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_add1.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Add Attribute Value - userdn not equals dn, user modifying entry from targeted branch'
</message>
@@ -2684,13 +2528,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_add1a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_add1a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Add Attribute Value - userdn not equals dn, admin deleting aci'
</message>
@@ -2716,13 +2558,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/add_common_prohibited_attr.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/add_common_prohibited_attr.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -2802,13 +2640,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_add2.1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_add2.1.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Add Attribute Value - targetattr equals one attribute not present, user modifying entry from non-targeted branch'
</message>
@@ -2818,13 +2654,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_add2a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_add2a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Add Attribute Value - targetattr equals one attribute not present, admin deleting aci'
</message>
@@ -2850,13 +2684,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/add_common_prohibited_attr.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/add_common_prohibited_attr.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -2953,13 +2783,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_add3.2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_add3.2.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Add Attribute Value - targetattr not equals attribute, add multi-values, user modifying entry from non-targeted branch'
</message>
@@ -2969,13 +2797,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_add3a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_add3a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Add Attribute Value - targetattr not equals attribute, add multi-values, admin deleting aci'
</message>
@@ -3001,13 +2827,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/add_common_prohibited_attr.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/add_common_prohibited_attr.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -3069,13 +2891,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-read_add4.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-read_add4.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Add Attribute Value - write not allowed, user modifying prohibited attr in entry from targeted branch'
</message>
@@ -3085,13 +2905,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-read_add4.1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-read_add4.1.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Add Attribute Value - write not allowed, user modifying entry from non-targeted branch'
</message>
@@ -3101,13 +2919,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-read_add4a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-read_add4a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Add Attribute Value - write not allowed, admin deleting aci'
</message>
@@ -3133,13 +2949,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/add_common_prohibited_attr.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/add_common_prohibited_attr.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -3220,13 +3032,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_add5.1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_add5.1.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Add Attribute Value - targetattr and targattrfilter, user modifying prohibited entry (by targattrfilter) from targeted branch'
</message>
@@ -3252,13 +3062,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_add5.3.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_add5.3.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Add Attribute Value - targetattr and targattrfilter, user modifying entry from non-targeted branch'
</message>
@@ -3268,13 +3076,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_delete5a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_delete5a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Add Attribute Value - targetattr and targattrfilter, overall allow, admin deleting aci'
</message>
@@ -3300,13 +3106,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/add_common_prohibited_attr.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/add_common_prohibited_attr.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -3383,13 +3185,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_delete6a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_delete6a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Add Attribute Value - targetfilter not equals three statements with or, none true, admin deleting aci'
</message>
@@ -3415,13 +3215,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/add_common_prohibited_attr.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/add_common_prohibited_attr.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -3498,13 +3294,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_add7a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_add7a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Add Attribute Value - targetfilter not equals three statements with and, all statements false, admin deleting aci'
</message>
@@ -3530,13 +3324,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_entry/add_common_prohibited_attr.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_modify_entry/add_common_prohibited_attr.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci1.xml b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci1.xml
index 7b6d25e..b3271a2 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci1.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci1.xml
@@ -126,13 +126,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 1 - Mod 3'
</message>
@@ -174,13 +172,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 1 - Mod 6'
</message>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci11.xml b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci11.xml
index e5213b0..c6f977e 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci11.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci11.xml
@@ -124,13 +124,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 11 - Mod 3'
</message>
@@ -140,13 +138,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 11 - Mod 4'
</message>
@@ -172,13 +168,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 11 - Mod 6'
</message>
@@ -188,13 +182,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 11 - Mod 7'
</message>
@@ -236,13 +228,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 11 - postamble, removing aci and entries'
</message>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci12.xml b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci12.xml
index 174e04a..a5d996e 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci12.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci12.xml
@@ -92,13 +92,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 12 - Mod 1'
</message>
@@ -108,13 +106,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 12 - Mod 2'
</message>
@@ -124,13 +120,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 12 - Mod 3'
</message>
@@ -140,13 +134,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 12 - Mod 4'
</message>
@@ -156,13 +148,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 12 - Mod 5'
</message>
@@ -188,13 +178,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 12 - Mod 7'
</message>
@@ -204,13 +192,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 12 - Mod 8'
</message>
@@ -220,13 +206,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 12 - Mod 9'
</message>
@@ -236,13 +220,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 12 - postamble, removing aci and entries'
</message>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci13.xml b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci13.xml
index 0a1b38e..a13b974 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci13.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci13.xml
@@ -140,13 +140,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 13 - Mod 4'
</message>
@@ -188,13 +186,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 13 - Mod 7'
</message>
@@ -236,13 +232,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 13 - postamble, removing aci and entries'
</message>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci14.xml b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci14.xml
index cb5d9e9..97704eb 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci14.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci14.xml
@@ -92,13 +92,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 14 - Mod 1'
</message>
@@ -108,13 +106,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 14 - Mod 2'
</message>
@@ -124,13 +120,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 14 - Mod 3'
</message>
@@ -140,13 +134,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 14 - Mod 4'
</message>
@@ -156,13 +148,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 14 - Mod 5'
</message>
@@ -172,13 +162,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 14 - Mod 6'
</message>
@@ -188,13 +176,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 14 - Mod 7'
</message>
@@ -204,13 +190,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 14 - Mod 8'
</message>
@@ -220,13 +204,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 14 - Mod 9'
</message>
@@ -236,13 +218,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 14 - postamble, removing aci and entries'
</message>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci15.xml b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci15.xml
index 3eaa92a..3ab0f71 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci15.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci15.xml
@@ -108,13 +108,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 15 - Mod 2'
</message>
@@ -140,13 +138,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 15 - Mod 4'
</message>
@@ -156,13 +152,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 15 - Mod 5'
</message>
@@ -188,13 +182,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 15 - Mod 7'
</message>
@@ -236,13 +228,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 15 - postamble, removing aci and entries'
</message>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci16.xml b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci16.xml
index 417cabe..ce56fbf 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci16.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci16.xml
@@ -92,13 +92,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 16 - Mod 1'
</message>
@@ -108,13 +106,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 16 - Mod 2'
</message>
@@ -124,13 +120,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 16 - Mod 3'
</message>
@@ -140,13 +134,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 16 - Mod 4'
</message>
@@ -172,13 +164,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 16 - Mod 6'
</message>
@@ -188,13 +178,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 16 - Mod 7'
</message>
@@ -204,13 +192,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 16 - Mod 8'
</message>
@@ -220,13 +206,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 16 - Mod 9'
</message>
@@ -236,13 +220,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 16 - postamble, removing aci and entries'
</message>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci2.xml b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci2.xml
index e76a1e5..8380e3d 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci2.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci2.xml
@@ -92,13 +92,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 2 - Mod 1'
</message>
@@ -108,13 +106,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 2 - Mod 2'
</message>
@@ -124,13 +120,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 2 - Mod 3'
</message>
@@ -156,13 +150,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 2 - Mod 5'
</message>
@@ -204,13 +196,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
-
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
+
<message>
'ACI: Modify Filter: ACI 2 - Mod 8'
</message>
@@ -220,13 +210,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 2 - Mod 9'
</message>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci21.xml b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci21.xml
index 9c27c2e..9349676 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci21.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci21.xml
@@ -124,13 +124,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 21 - Mod 3'
</message>
@@ -172,13 +170,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 21 - Mod 6'
</message>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci22.xml b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci22.xml
index 967af95..11ef22f 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci22.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci22.xml
@@ -92,13 +92,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 22 - Mod 1'
</message>
@@ -108,13 +106,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 22 - Mod 2'
</message>
@@ -124,13 +120,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 22 - Mod 3'
</message>
@@ -156,13 +150,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 22 - Mod 5'
</message>
@@ -204,13 +196,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 22 - Mod 8'
</message>
@@ -220,13 +210,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 22 - Mod 9'
</message>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci24.xml b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci24.xml
index b2f9b4e..2659823 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci24.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci24.xml
@@ -92,13 +92,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 24 - Mod 1'
</message>
@@ -108,13 +106,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 24 - Mod 2'
</message>
@@ -124,13 +120,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 24 - Mod 3'
</message>
@@ -156,13 +150,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 24 - Mod 5'
</message>
@@ -172,13 +164,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 24 - Mod 6'
</message>
@@ -204,13 +194,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 24 - Mod 8'
</message>
@@ -220,13 +208,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 24 - Mod 9'
</message>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci25.xml b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci25.xml
index 882002c..b2a0aa5 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci25.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci25.xml
@@ -108,13 +108,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 25 - Mod 2'
</message>
@@ -156,13 +154,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 25 - Mod 5'
</message>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci26.xml b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci26.xml
index 087da1e..7bc1167 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci26.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci26.xml
@@ -92,13 +92,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 26 - Mod 1'
</message>
@@ -108,13 +106,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 26 - Mod 2'
</message>
@@ -124,13 +120,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 26 - Mod 3'
</message>
@@ -172,13 +166,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 26 - Mod 6'
</message>
@@ -204,13 +196,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 26 - Mod 8'
</message>
@@ -220,13 +210,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 26 - Mod 9'
</message>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci4.xml b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci4.xml
index e33086d..e097a2a 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci4.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci4.xml
@@ -92,13 +92,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 4 - Mod 1'
</message>
@@ -108,13 +106,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 4 - Mod 2'
</message>
@@ -124,13 +120,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 4 - Mod 3'
</message>
@@ -156,13 +150,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 4 - Mod 5'
</message>
@@ -172,13 +164,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 4 - Mod 6'
</message>
@@ -204,13 +194,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 4 - Mod 8'
</message>
@@ -220,13 +208,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 4 - Mod 9'
</message>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci5.xml b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci5.xml
index 8d48c8b..df12e8d 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci5.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci5.xml
@@ -108,13 +108,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 5 - Mod 2'
</message>
@@ -156,13 +154,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 5 - Mod 5'
</message>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci6.xml b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci6.xml
index bd474e2..c9f09e7 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci6.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci6.xml
@@ -92,13 +92,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 6 - Mod 1'
</message>
@@ -108,13 +106,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 6 - Mod 2'
</message>
@@ -124,13 +120,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 6 - Mod 3'
</message>
@@ -172,13 +166,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 6 - Mod 6'
</message>
@@ -204,13 +196,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 6 - Mod 8'
</message>
@@ -220,13 +210,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 6 - Mod 9'
</message>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_rdn.xml b/opends/tests/functional-tests/testcases/aci/aci_modify_rdn.xml
index 484cfbc..61d49f9 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_modify_rdn.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_modify_rdn.xml
@@ -202,13 +202,11 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'uid=tmorris, ou=People, ou=branch one, ou=aci branch, o=Modify RDN Tests,o=ACI Tests,dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'attributes' : 'cn'}
+ 'attributes' : 'cn',
+ 'expectedRC' : 32
+ }
</call>
- <if expr="RC != 32">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Leaf - targetattr=* and userdn=all, user modifying entry from non-targeted branch'
</message>
@@ -218,13 +216,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry1a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry1a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Leaf - targetattr=* and userdn=all, admin deleting aci'
</message>
@@ -250,15 +246,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -367,13 +359,11 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'uid=kvaughan, ou=People, ou=branch one, ou=aci branch, o=Modify RDN Tests,o=ACI Tests,dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'attributes' : 'cn'}
+ 'attributes' : 'cn',
+ 'expectedRC' : 32
+ }
</call>
- <if expr="RC != 32">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Branch - targetattr=* and userdn=all, user modifying entry from non-targeted branch'
</message>
@@ -383,13 +373,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry2a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry2a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Branch - targetattr=* and userdn=all, user restoring branch in previously targeted branch'
</message>
@@ -431,15 +419,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -547,13 +531,11 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'uid=dmiller, ou=People, ou=branch one, ou=aci branch, o=Modify RDN Tests,o=ACI Tests,dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'attributes' : 'cn'}
+ 'attributes' : 'cn',
+ 'expectedRC' : 32
+ }
</call>
- <if expr="RC != 32">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Leaf - targetattr equals three attributes with uid, user modifying entry from non-targeted branch'
</message>
@@ -563,13 +545,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry3a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry3a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Leaf - targetattr equals three attributes with uid, admin deleting aci'
</message>
@@ -595,13 +575,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -664,13 +640,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry4.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry4.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Leaf - targetattr equals three attributes without uid, user modifying entry from non-targeted branch'
</message>
@@ -680,13 +654,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry4a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry4a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Leaf - targetattr equals three attributes without uid, admin deleting aci'
</message>
@@ -712,13 +684,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -829,13 +797,11 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'uid=kvaughan, ou=People, ou=branch one, ou=aci branch, o=Modify RDN Tests,o=ACI Tests,dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'attributes' : 'cn'}
+ 'attributes' : 'cn',
+ 'expectedRC' : 32
+ }
</call>
- <if expr="RC != 32">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Branch - targetattr with three attributes equals ou, user modifying entry from non-targeted branch'
</message>
@@ -845,13 +811,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry5a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry5a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Branch - targetattr with three attributes equals ou, user restoring branch in previously targeted branch'
</message>
@@ -893,13 +857,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -961,13 +921,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry6.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry6.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Branch - targetattr with three attributes not equals ou, user modifying entry from non-targeted branch'
</message>
@@ -977,13 +935,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry6a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry6a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Branch - targetattr with three attributes not equals ou, admin deleting aci'
</message>
@@ -1009,13 +965,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1126,13 +1078,11 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'uid=trigden, ou=People, ou=branch one, ou=aci branch, o=Modify RDN Tests,o=ACI Tests,dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'attributes' : 'cn'}
+ 'attributes' : 'cn',
+ 'expectedRC' : 32
+ }
</call>
- <if expr="RC != 32">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Leaf - Multi ACIs, allow and deny, user modifying prohibited entry from targeted branch'
</message>
@@ -1142,13 +1092,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry7.1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry7.1.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Leaf - Multi ACIs, allow and deny, user modifying entry from non-targeted branch'
</message>
@@ -1158,13 +1106,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry7a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry7a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Leaf - Multi ACIs, allow and deny, admin deleting aci'
</message>
@@ -1190,13 +1136,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1309,13 +1251,11 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'uid=kvaughan, ou=People, ou=branch one, ou=aci branch, o=Modify RDN Tests,o=ACI Tests,dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'attributes' : 'cn'}
+ 'attributes' : 'cn',
+ 'expectedRC' : 32
+ }
</call>
- <if expr="RC != 32">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Branch - Multi ACIs, deny write on new branch, user modifying entry from non-targeted branch'
</message>
@@ -1325,13 +1265,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry8a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry8a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Branch - Multi ACIs, deny write on new branch, user restoring branch in previously targeted branch'
</message>
@@ -1341,13 +1279,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_restore3.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_restore3.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Branch - Multi ACIs, deny write on new branch, preamble replacing aci'
</message>
@@ -1405,13 +1341,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1474,13 +1406,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry9.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry9.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Leaf - targetattr with three attributes not equals uid, delete old rdn, user modifying entry from non-targeted branch'
</message>
@@ -1490,13 +1420,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry9a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry9a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Leaf - targetattr with three attributes not equals uid, delete old rdn, admin deleting aci'
</message>
@@ -1522,13 +1450,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1639,13 +1563,11 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'uid=jwallace, ou=People, ou=branch one, ou=aci branch, o=Modify RDN Tests,o=ACI Tests,dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'attributes' : 'cn'}
+ 'attributes' : 'cn',
+ 'expectedRC' : 32
+ }
</call>
- <if expr="RC != 32">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Leaf - targetattr with three attributes not equals uid, dont delete old rdn, user modifying entry from non-targeted branch'
</message>
@@ -1655,13 +1577,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry10a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry10a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Leaf - targetattr with three attributes not equals uid, dont delete old rdn, admin deleting aci'
</message>
@@ -1687,13 +1607,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1758,13 +1674,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry11.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry11.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Leaf - targetattr with three attributes not equals sn and cn, dont delete old rdn, user modifying entry from non-targeted branch'
</message>
@@ -1774,13 +1688,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry11a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry11a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Leaf - targetattr with three attributes not equals sn and cn, dont delete old rdn, admin deleting aci'
</message>
@@ -1806,13 +1718,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1923,13 +1831,11 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'uid=kvaughan, ou=People, ou=branch one, ou=aci branch, o=Modify RDN Tests,o=ACI Tests,dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'attributes' : 'cn'}
+ 'attributes' : 'cn',
+ 'expectedRC' : 32
+ }
</call>
- <if expr="RC != 32">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Branch - Multi ACIs, targattrfilters add:ou, del:ou, user modifying entry from non-targeted branch'
</message>
@@ -1939,13 +1845,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry21a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry21a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Branch - Multi ACIs, targattrfilters add:ou, del:ou, user restoring branch in previously targeted branch'
</message>
@@ -1987,13 +1891,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -2106,13 +2006,11 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'uid=kvaughan, ou=People, ou=branch one, ou=aci branch, o=Modify RDN Tests,o=ACI Tests,dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'attributes' : 'cn'}
+ 'attributes' : 'cn',
+ 'expectedRC' : 32
+ }
</call>
- <if expr="RC != 32">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Branch - Multi ACIs, targattrfilters add:ou, del:ou 2, user modifying entry from non-targeted branch'
</message>
@@ -2122,13 +2020,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry22a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry22a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Branch - Multi ACIs, targattrfilters add:ou, del:ou 2, user restoring branch in previously targeted branch'
</message>
@@ -2138,13 +2034,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_restore4.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_restore4.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Branch - Multi ACIs, deny write on new branch, preamble replacing aci'
</message>
@@ -2202,15 +2096,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_rdn_wildcards.xml b/opends/tests/functional-tests/testcases/aci/aci_rdn_wildcards.xml
index d59e2ac..a6d87a3 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_rdn_wildcards.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_rdn_wildcards.xml
@@ -1762,13 +1762,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 21 }
+ 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'expectedRC' : 21
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1806,15 +1802,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'expectedRC' : 21
+ }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 21 }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -1850,13 +1842,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 21 }
+ 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'expectedRC' : 21
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1894,15 +1882,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'expectedRC' : 21
+ }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 21 }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_targattrfilter.xml b/opends/tests/functional-tests/testcases/aci/aci_targattrfilter.xml
index b4712f5..55490a3 100644
--- a/opends/tests/functional-tests/testcases/aci/aci_targattrfilter.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_targattrfilter.xml
@@ -223,13 +223,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/add_title1a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/add_title1a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Targattrfilter equals del:telephonenumber, user deleting roomnumber from targeted entry'
</message>
@@ -255,13 +253,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/add_title1b.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/add_title1b.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Targattrfilter equals add:title, admin deleting aci'
</message>
@@ -287,13 +283,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/add_carlicense1.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/add_carlicense1.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -375,13 +367,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/del_title2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/del_title2.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Targattrfilter equals del:roomnumber, user deleting roomnumber from targeted entry'
</message>
@@ -407,13 +397,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/del_roomnumber2a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/del_roomnumber2a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Targattrfilter equals del:roomnumber, admin deleting aci'
</message>
@@ -439,13 +427,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/del_faxnumber2.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/del_faxnumber2.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -525,13 +509,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_mail3.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_mail3.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Targattrfilter equals add:l,del:l, user replacing l in non-targeted entry'
</message>
@@ -541,13 +523,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_l3a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_l3a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Targattrfilter equals add:l,del:l, admin deleting aci'
</message>
@@ -573,13 +553,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_l3.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_l3.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -643,13 +619,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_st4.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_st4.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Targattrfilter equals add:st,del:st, user replacing mail in targeted entry'
</message>
@@ -675,13 +649,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_st4a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_st4a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Targattrfilter equals add:st,del:st, admin deleting aci'
</message>
@@ -707,15 +679,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_st4.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_st4.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -809,13 +777,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_l5a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_l5a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Targattrfilter equals add:l,del:l, admin deleting aci'
</message>
@@ -841,13 +807,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_l5.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_l5.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -926,13 +888,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_mail17.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_mail17.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Targattrfilter equals add:street,del:street wildcard only, street not present, user replacing street in non-targeted entry'
</message>
@@ -942,13 +902,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_street17a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_street17a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Targattrfilter equals add:street,del:street wildcard only, street not present, admin deleting aci'
</message>
@@ -974,15 +932,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_street17.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_street17.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -1043,13 +997,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_title6.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_title6.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Targattrfilter equals add:title,del:title with wildcards, user replacing title in non-targeted entry'
</message>
@@ -1059,13 +1011,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_title6a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_title6a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Targattrfilter equals add:title,del:title with wildcards, admin deleting aci'
</message>
@@ -1091,15 +1041,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_title6.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_title6.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -1137,15 +1083,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'expectedRC' : 21
+ }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 21 }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -1183,13 +1125,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 21 }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'expectedRC' : 21
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1229,13 +1167,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'expectedRC' : 21
+ }
</call>
- <if expr="RC != 21">
- <tcstatus result="'fail'"/>
- </if>
-
<!-- The following operation can be removed when Issue 1473 is fixed. -->
<message>
'ACI: Targattrfilter: Targattrfilter with mispelled del with add, admin deleting aci'
@@ -1291,12 +1227,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'expectedRC' : 21
+ }
</call>
-
- <if expr="RC != 21">
- <tcstatus result="'fail'"/>
- </if>
<!-- The following operation can be removed when Issue 1473 is fixed. -->
<message>
@@ -1353,15 +1287,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'expectedRC' : 21
+ }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 21 }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -1399,12 +1329,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'expectedRC' : 21
+ }
</call>
-
- <if expr="RC != 21">
- <tcstatus result="'fail'"/>
- </if>
<!-- The following operation can be removed when Issue 1473 is fixed. -->
<message>
@@ -1461,13 +1389,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 21 }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'expectedRC' : 21
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1507,13 +1431,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 21 }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'expectedRC' : 21
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1553,13 +1473,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 21 }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'expectedRC' : 21
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1599,13 +1515,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 21 }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'expectedRC' : 21
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1701,13 +1613,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/aci_targattrfilter/add_carlicense18.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/aci_targattrfilter/add_carlicense18.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_target.xml b/opends/tests/functional-tests/testcases/aci/aci_target.xml
index a39bd91..e422c56 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_target.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_target.xml
@@ -1057,13 +1057,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'expectedRC' : 21
+ }
</call>
- <if expr="RC != 21">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN With Keyword self - check aci'
</message>
@@ -1127,13 +1125,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN Above Entry - check aci'
</message>
@@ -1339,13 +1335,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'expectedRC' : 21
+ }
</call>
- <if expr="RC != 21">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Multiple Targets - check aci'
</message>
@@ -1410,13 +1404,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'expectedRC' : 21
+ }
</call>
- <if expr="RC != 21">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Keyword Target Misspelled - check aci'
</message>
@@ -1481,13 +1473,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'expectedRC' : 21
+ }
</call>
- <if expr="RC != 21">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Missing leading ldap: - check aci'
</message>
@@ -1551,13 +1541,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'expectedRC' : 21
+ }
</call>
- <if expr="RC != 21">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: With ldap:all - check aci'
</message>
@@ -1622,7 +1610,7 @@
'attributeName' : 'aci' ,
'newAttributeValue' : curr_aci ,
'changetype' : 'add' ,
- 'expectedErrorCode' : '21'}
+ 'expectedRC' : 21}
</call>
<if expr="RC != 0">
@@ -3306,13 +3294,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=scarter,ou=People,ou=aci branch,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'sprain' ,
- 'entryToBeModified' : '%s/aci/aci_target/mod_entry31a.ldif' % (logsRemoteDataDir) }
+ 'entryToBeModified' : '%s/aci/aci_target/mod_entry31a.ldif' % (logsRemoteDataDir) ,
+ 'expectedRC' : 53
+ }
</call>
- <if expr="RC != 53">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: userdn equals self - modify operational attributes, modify 3'
</message>
@@ -3322,13 +3308,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=scarter,ou=People,ou=aci branch,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'sprain' ,
- 'entryToBeModified' : '%s/aci/aci_target/mod_entry31b.ldif' % (logsRemoteDataDir) }
+ 'entryToBeModified' : '%s/aci/aci_target/mod_entry31b.ldif' % (logsRemoteDataDir) ,
+ 'expectedRC' : 53
+ }
</call>
- <if expr="RC != 53">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: userdn equals self - modify operational attributes, modify 4'
</message>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml b/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml
index d2cbd6c..fb740e1 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml
@@ -1008,13 +1008,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'expectedRC' : 21
+ }
</call>
- <if expr="RC != 21">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetattr: Multiple Targets - check aci'
</message>
@@ -1074,13 +1072,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'expectedRC' : 21
+ }
</call>
- <if expr="RC != 21">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetattr: Keyword Targetattr Mispelled - check aci'
</message>
@@ -1140,13 +1136,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'expectedRC' : 21
+ }
</call>
- <if expr="RC != 21">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetattr: Targetattr With Missing Quotes - check aci'
</message>
@@ -1371,13 +1365,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'expectedRC' : 0
+ }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Targetattr Not Equals Wildcard, user searching targeted entry'
</message>
@@ -1509,13 +1501,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'expectedRC' : 21
+ }
</call>
- <if expr="RC != 21">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml b/opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml
index 1a9bf49..60f22f2 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml
@@ -2926,13 +2926,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'expectedRC' : 21
+ }
</call>
- <if expr="RC != 21">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter With Missing Quotes, user searching targeted entry'
</message>
@@ -2995,13 +2993,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'expectedRC' : 21
+ }
</call>
- <if expr="RC != 21">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter With Missing Quotes 2, user searching targeted entry'
</message>
@@ -3064,13 +3060,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'expectedRC' : 21
+ }
</call>
- <if expr="RC != 21">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter With Improperly Formatted Filter with or, user searching targeted entry'
</message>
@@ -3133,13 +3127,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+ 'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'expectedRC' : 21
+ }
</call>
- <if expr="RC != 21">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter With Improperly Formatted Filter with and, user searching targeted entry'
</message>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_targetscope.xml b/opends/tests/functional-tests/testcases/aci/aci_targetscope.xml
index e83e2df..e186e13 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_targetscope.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_targetscope.xml
@@ -1024,13 +1024,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetscope/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 21 }
+ 'entryToBeModified' : '%s/aci/aci_targetscope/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'expectedRC' : 21
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1068,13 +1064,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetscope/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 21 }
+ 'entryToBeModified' : '%s/aci/aci_targetscope/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'expectedRC' : 21
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -1112,13 +1104,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_targetscope/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 21 }
+ 'entryToBeModified' : '%s/aci/aci_targetscope/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+ 'expectedRC' : 21
+ }
</call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_teardown.xml b/opends/tests/functional-tests/testcases/aci/aci_teardown.xml
index 274d0ab..a5e40e2 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_teardown.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_teardown.xml
@@ -92,10 +92,6 @@
'entryToBeModified' : '%s/aci/aci_disable.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: ACI Teardown: Removing Initial Entries'
</message>
@@ -109,11 +105,6 @@
'extraParams' : '-x'}
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/aci/global_acis.xml b/opends/tests/functional-tests/testcases/aci/global_acis.xml
index 2e1778b..c9e946b 100755
--- a/opends/tests/functional-tests/testcases/aci/global_acis.xml
+++ b/opends/tests/functional-tests/testcases/aci/global_acis.xml
@@ -654,13 +654,9 @@
'dsInstancePswd' : 'ACIRules' ,
'dsBaseDN' : 'cn=config' ,
'dsFilter' : 'objectclass=*' ,
- 'attributes' : '+'}
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'attributes' : '+' ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -864,13 +860,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/global_acis/mod_entry1.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/global_acis/mod_entry1.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -903,13 +895,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/global_acis/del_entry1.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/global_acis/del_entry1.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -942,13 +930,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/global_acis/modrdn_entry1.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/global_acis/modrdn_entry1.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -983,11 +967,6 @@
'dsInstancePswd' : 'ACIRules' ,
'entryToBeModified' : '%s/aci/global_acis/mod_entry2.ldif' % logsRemoteDataDir }
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/functional-tests/testcases/aci/multiple_aci_tests.xml b/opends/tests/functional-tests/testcases/aci/multiple_aci_tests.xml
index c2512cf..468a017 100644
--- a/opends/tests/functional-tests/testcases/aci/multiple_aci_tests.xml
+++ b/opends/tests/functional-tests/testcases/aci/multiple_aci_tests.xml
@@ -3124,13 +3124,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_mail31.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_mail31.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targattrfilters with add:l and del:l, user replacing l in non-targeted entry'
</message>
@@ -3140,13 +3138,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l31a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l31a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targattrfilters with add:l and del:l, admin deleting aci'
</message>
@@ -3172,13 +3168,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l31.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l31.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -3240,13 +3232,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l32.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l32.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targattrfilters with deny add:l and allow del:l, user replacing mail in targeted entry'
</message>
@@ -3256,13 +3246,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_mail32.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_mail32.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targattrfilters with deny add:l and allow del:l, user replacing l in non-targeted entry'
</message>
@@ -3272,13 +3260,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l32a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l32a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targattrfilters with deny add:l and allow del:l, admin deleting aci'
</message>
@@ -3304,13 +3290,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l32.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l32.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -3372,13 +3354,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l33.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l33.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targattrfilters with allow add:l and deny del:l, user replacing mail in targeted entry'
</message>
@@ -3388,13 +3368,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_mail33.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_mail33.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targattrfilters with allow add:l and deny del:l, user replacing l in non-targeted entry'
</message>
@@ -3404,13 +3382,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l33a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l33a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targattrfilters with allow add:l and deny del:l, admin deleting aci'
</message>
@@ -3436,13 +3412,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l33.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l33.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -3518,13 +3490,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_title34.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_title34.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targetattrs, user modifying entry from non-targeted branch'
</message>
@@ -3534,13 +3504,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l34a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l34a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targetattrs, admin deleting aci'
</message>
@@ -3566,13 +3534,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/mod_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -3697,13 +3661,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/mod_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -3781,13 +3741,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_title36.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_title36.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targetattrs and targattrfilters with equals and not equals, user modifying prohibited attr in entry from targeted branch'
</message>
@@ -3797,13 +3755,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_title36.1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_title36.1.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targetattrs and targattrfilters with equals and not equals, user modifying entry from non-targeted branch'
</message>
@@ -3813,13 +3769,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l36a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l36a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targetattrs and targattrfilters with equals and not equals, admin deleting aci'
</message>
@@ -3845,13 +3799,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/mod_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -3929,13 +3879,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_title37.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_title37.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targetattrs and targattrfilters with not equals, user modifying prohibited attr in entry from targeted branch'
</message>
@@ -3945,13 +3893,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_title37.1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_title37.1.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targetattrs and targattrfilters with not equals, user modifying entry from non-targeted branch'
</message>
@@ -3961,13 +3907,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l37a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l37a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targetattrs and targattrfilters with not equals, admin deleting aci'
</message>
@@ -3993,13 +3937,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/mod_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -4076,13 +4016,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_title38.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_title38.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targetattrs and targattrfilters with deny, user modifying prohibited attr in entry from targeted branch'
</message>
@@ -4092,13 +4030,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_title38.1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_title38.1.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targetattrs and targattrfilters with deny, user modifying entry from non-targeted branch'
</message>
@@ -4108,13 +4044,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l38a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l38a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targetattrs and targattrfilters with deny, admin deleting aci'
</message>
@@ -4140,13 +4074,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/mod_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -4207,13 +4137,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l39.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l39.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targetattrs with deny and targattrfilters , user modifying prohibited attr in entry from targeted branch'
</message>
@@ -4223,13 +4151,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_title39.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_title39.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targetattrs with deny and targattrfilters , user modifying prohibited attr in entry from targeted branch'
</message>
@@ -4239,13 +4165,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_title39.1.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_title39.1.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targetattrs with deny and targattrfilters , user modifying entry from non-targeted branch'
</message>
@@ -4255,13 +4179,11 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l37a.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l37a.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targetattrs with deny and targattrfilters , admin deleting aci'
</message>
@@ -4287,13 +4209,9 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=auser,ou=people,o=ACI Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
- 'entryToBeModified' : '%s/aci/multiple_aci_tests/mod_common_prohibited_entry.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
+ 'entryToBeModified' : '%s/aci/multiple_aci_tests/mod_common_prohibited_entry.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
+ }
</call>
<call function="'testCase_Postamble'"/>
--
Gitblit v1.10.0