From 8edfd804e057943d972f7e188c1965c11f157550 Mon Sep 17 00:00:00 2001
From: mkeyes <mkeyes@localhost>
Date: Mon, 16 Jul 2007 18:38:25 +0000
Subject: [PATCH] Finished the cleanup in the Privileges functional test suites that was required after the library functions wer e modified to declare PASS or FAIL.
---
opends/tests/functional-tests/testcases/privileges/privileges_directory_manager.xml | 138 +++------
opends/tests/functional-tests/testcases/privileges/privileges_users.xml | 316 ----------------------
opends/tests/functional-tests/testcases/privileges/privileges_import_task.xml | 32 --
opends/tests/functional-tests/testcases/privileges/privileges_new_root_user.xml | 200 --------------
opends/tests/functional-tests/testcases/privileges/privileges_restore_task.xml | 44 ---
opends/tests/functional-tests/testcases/privileges/privileges_backup_task.xml | 40 --
opends/tests/functional-tests/testcases/privileges/privileges_export_task.xml | 36 --
7 files changed, 57 insertions(+), 749 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/privileges/privileges_backup_task.xml b/opends/tests/functional-tests/testcases/privileges/privileges_backup_task.xml
index bcacbb2..709238a 100755
--- a/opends/tests/functional-tests/testcases/privileges/privileges_backup_task.xml
+++ b/opends/tests/functional-tests/testcases/privileges/privileges_backup_task.xml
@@ -118,10 +118,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Backup Tasks: backend-backup, user adding backup task'
</message>
@@ -159,11 +155,7 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
- <message>
+ <message>
'Privileges: Backup Tasks: backend-backup, user adding backup task'
</message>
@@ -196,10 +188,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Backup Tasks: backend-backup, Admin deleting global ACI'
</message>
@@ -215,11 +203,7 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
- <message>
+ <message>
'Privileges: Backup Tasks: backend-backup, user adding backup task'
</message>
@@ -301,10 +285,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Backup Tasks: backend-backup, Directory Manager, DM adding backup task'
</message>
@@ -338,10 +318,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Backup Tasks: backend-backup, Directory Manager, DM adding backup task'
</message>
@@ -402,10 +378,6 @@
'entryToBeAdded' : '%s/privileges/add_new_root_user.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Backup Tasks: backend-backup, New Root User, new root user adding backup task'
</message>
@@ -439,10 +411,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Backup Tasks: backend-backup, New Root User, new root user adding backup task'
</message>
@@ -476,10 +444,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Backup Tasks: backend-backup, New Root User, new root user adding backup task'
</message>
diff --git a/opends/tests/functional-tests/testcases/privileges/privileges_directory_manager.xml b/opends/tests/functional-tests/testcases/privileges/privileges_directory_manager.xml
index b4a6c7e..2c74a86 100644
--- a/opends/tests/functional-tests/testcases/privileges/privileges_directory_manager.xml
+++ b/opends/tests/functional-tests/testcases/privileges/privileges_directory_manager.xml
@@ -99,8 +99,7 @@
'DNToModify' : 'cn=Access Control Handler,cn=config' ,
'attributeName' : 'ds-cfg-global-aci' ,
'newAttributeValue' : global_aci ,
- 'changetype' : 'delete' ,
- 'expectedRC' : 0
+ 'changetype' : 'delete'
}
</call>
@@ -152,8 +151,7 @@
'DNToModify' : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
'attributeName' : 'ds-privilege-name' ,
'newAttributeValue' : '-bypass-acl' ,
- 'changetype' : 'add' ,
- 'expectedRC' : 0
+ 'changetype' : 'add'
}
</call>
@@ -198,8 +196,7 @@
'DNToModify' : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
'attributeName' : 'ds-privilege-name' ,
'newAttributeValue' : '-bypass-acl' ,
- 'changetype' : 'delete' ,
- 'expectedRC' : 0
+ 'changetype' : 'delete'
}
</call>
@@ -251,8 +248,7 @@
'DNToModify' : 'cn=Access Control Handler,cn=config' ,
'attributeName' : 'ds-cfg-global-aci' ,
'newAttributeValue' : global_aci ,
- 'changetype' : 'add' ,
- 'expectedRC' : 0
+ 'changetype' : 'add'
}
</call>
@@ -324,8 +320,7 @@
'DNToModify' : 'cn=Access Control Handler,cn=config' ,
'attributeName' : 'ds-cfg-global-aci' ,
'newAttributeValue' : global_aci ,
- 'changetype' : 'delete' ,
- 'expectedRC' : 0
+ 'changetype' : 'delete'
}
</call>
@@ -396,8 +391,7 @@
'DNToModify' : 'cn=Access Control Handler,cn=config' ,
'attributeName' : 'ds-cfg-global-aci' ,
'newAttributeValue' : global_aci ,
- 'changetype' : 'add' ,
- 'expectedRC' : 0
+ 'changetype' : 'add'
}
</call>
@@ -471,8 +465,7 @@
'DNToModify' : 'ou=People, o=Privileges Tests, dc=example,dc=com' ,
'attributeName' : 'aci' ,
'newAttributeValue' : search_aci ,
- 'changetype' : 'add' ,
- 'expectedRC' : 0
+ 'changetype' : 'add'
}
</call>
@@ -488,8 +481,7 @@
'DNToModify' : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
'attributeName' : 'ds-privilege-name' ,
'newAttributeValue' : '-modify-acl' ,
- 'changetype' : 'add' ,
- 'expectedRC' : 0
+ 'changetype' : 'add'
}
</call>
@@ -526,8 +518,7 @@
'DNToModify' : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
'attributeName' : 'ds-privilege-name' ,
'newAttributeValue' : '-modify-acl' ,
- 'changetype' : 'delete' ,
- 'expectedRC' : 0
+ 'changetype' : 'delete'
}
</call>
@@ -543,8 +534,7 @@
'DNToModify' : 'ou=People, o=Privileges Tests, dc=example,dc=com' ,
'attributeName' : 'aci' ,
'newAttributeValue' : search2_aci ,
- 'changetype' : 'add' ,
- 'expectedRC' : 0
+ 'changetype' : 'add'
}
</call>
@@ -560,8 +550,7 @@
'DNToModify' : 'ou=People, o=Privileges Tests, dc=example,dc=com' ,
'attributeName' : 'aci' ,
'newAttributeValue' : search_aci ,
- 'changetype' : 'delete' ,
- 'expectedRC' : 0
+ 'changetype' : 'delete'
}
</call>
@@ -628,8 +617,7 @@
'DNToModify' : 'uid=tmorris, ou=People, o=Privileges Tests, dc=example,dc=com' ,
'attributeName' : 'aci' ,
'newAttributeValue' : search_aci ,
- 'changetype' : 'replace' ,
- 'expectedRC' : 0
+ 'changetype' : 'replace'
}
</call>
@@ -645,8 +633,7 @@
'DNToModify' : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
'attributeName' : 'ds-privilege-name' ,
'newAttributeValue' : '-modify-acl' ,
- 'changetype' : 'add' ,
- 'expectedRC' : 0
+ 'changetype' : 'add'
}
</call>
@@ -679,8 +666,7 @@
'DNToModify' : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
'attributeName' : 'ds-privilege-name' ,
'newAttributeValue' : '-modify-acl' ,
- 'changetype' : 'delete' ,
- 'expectedRC' : 0
+ 'changetype' : 'delete'
}
</call>
@@ -746,8 +732,7 @@
'DNToModify' : 'uid=gfarmer, ou=People, o=Privileges Tests, dc=example,dc=com' ,
'attributeName' : 'aci' ,
'newAttributeValue' : search_aci ,
- 'changetype' : 'delete' ,
- 'expectedRC' : 0
+ 'changetype' : 'delete'
}
</call>
@@ -763,8 +748,7 @@
'DNToModify' : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
'attributeName' : 'ds-privilege-name' ,
'newAttributeValue' : '-modify-acl' ,
- 'changetype' : 'add' ,
- 'expectedRC' : 0
+ 'changetype' : 'add'
}
</call>
@@ -886,8 +870,7 @@
'DNToModify' : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
'attributeName' : 'ds-privilege-name' ,
'newAttributeValue' : '-config-read' ,
- 'changetype' : 'add' ,
- 'expectedRC' : 0
+ 'changetype' : 'add'
}
</call>
@@ -920,8 +903,7 @@
'DNToModify' : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
'attributeName' : 'ds-privilege-name' ,
'newAttributeValue' : '-config-read' ,
- 'changetype' : 'delete' ,
- 'expectedRC' : 0
+ 'changetype' : 'delete'
}
</call>
@@ -992,8 +974,7 @@
'DNToModify' : 'cn=config' ,
'attributeName' : 'ds-cfg-check-schema' ,
'newAttributeValue' : 'true' ,
- 'changetype' : 'replace' ,
- 'expectedRC' : 0
+ 'changetype' : 'replace'
}
</call>
@@ -1009,8 +990,7 @@
'DNToModify' : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
'attributeName' : 'ds-privilege-name' ,
'newAttributeValue' : '-config-read' ,
- 'changetype' : 'add' ,
- 'expectedRC' : 0
+ 'changetype' : 'add'
}
</call>
@@ -1043,8 +1023,7 @@
'DNToModify' : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
'attributeName' : 'ds-privilege-name' ,
'newAttributeValue' : '-config-write' ,
- 'changetype' : 'add' ,
- 'expectedRC' : 0
+ 'changetype' : 'add'
}
</call>
@@ -1077,8 +1056,7 @@
'DNToModify' : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
'attributeName' : 'ds-privilege-name' ,
'newAttributeValue' : '-config-read' ,
- 'changetype' : 'delete' ,
- 'expectedRC' : 0
+ 'changetype' : 'delete'
}
</call>
@@ -1111,8 +1089,7 @@
'DNToModify' : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
'attributeName' : 'ds-privilege-name' ,
'newAttributeValue' : '-config-write' ,
- 'changetype' : 'delete' ,
- 'expectedRC' : 0
+ 'changetype' : 'delete'
}
</call>
@@ -1184,8 +1161,7 @@
'DNToModify' : 'cn=Access Control Handler,cn=config' ,
'attributeName' : 'ds-cfg-global-aci' ,
'newAttributeValue' : global_aci ,
- 'changetype' : 'add' ,
- 'expectedRC' : 0
+ 'changetype' : 'add'
}
</call>
@@ -1201,8 +1177,7 @@
'DNToModify' : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
'attributeName' : 'ds-privilege-name' ,
'newAttributeValue' : '-config-read' ,
- 'changetype' : 'add' ,
- 'expectedRC' : 0
+ 'changetype' : 'add'
}
</call>
@@ -1239,8 +1214,7 @@
'DNToModify' : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
'attributeName' : 'ds-privilege-name' ,
'newAttributeValue' : '-config-write' ,
- 'changetype' : 'add' ,
- 'expectedRC' : 0
+ 'changetype' : 'add'
}
</call>
@@ -1256,8 +1230,7 @@
'DNToModify' : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
'attributeName' : 'ds-privilege-name' ,
'newAttributeValue' : '-config-read' ,
- 'changetype' : 'delete' ,
- 'expectedRC' : 0
+ 'changetype' : 'delete'
}
</call>
@@ -1290,8 +1263,7 @@
'DNToModify' : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
'attributeName' : 'ds-privilege-name' ,
'newAttributeValue' : '-config-write' ,
- 'changetype' : 'delete' ,
- 'expectedRC' : 0
+ 'changetype' : 'delete'
}
</call>
@@ -1307,8 +1279,7 @@
'DNToModify' : 'cn=Access Control Handler,cn=config' ,
'attributeName' : 'ds-cfg-global-aci' ,
'newAttributeValue' : global2_aci ,
- 'changetype' : 'add' ,
- 'expectedRC' : 0
+ 'changetype' : 'add'
}
</call>
@@ -1324,8 +1295,7 @@
'DNToModify' : 'cn=Access Control Handler,cn=config' ,
'attributeName' : 'ds-cfg-global-aci' ,
'newAttributeValue' : global_aci ,
- 'changetype' : 'delete' ,
- 'expectedRC' : 0
+ 'changetype' : 'delete'
}
</call>
@@ -1388,8 +1358,7 @@
'DNToModify' : 'uid=tmason, ou=People, o=Privileges Tests, dc=example,dc=com' ,
'attributeName' : 'userpassword' ,
'newAttributeValue' : 'pickles' ,
- 'changetype' : 'replace' ,
- 'expectedRC' : 0
+ 'changetype' : 'replace'
}
</call>
@@ -1405,8 +1374,7 @@
'DNToModify' : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
'attributeName' : 'ds-privilege-name' ,
'newAttributeValue' : '-password-reset' ,
- 'changetype' : 'add' ,
- 'expectedRC' : 0
+ 'changetype' : 'add'
}
</call>
@@ -1439,8 +1407,7 @@
'DNToModify' : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
'attributeName' : 'ds-privilege-name' ,
'newAttributeValue' : '-password-reset' ,
- 'changetype' : 'delete' ,
- 'expectedRC' : 0
+ 'changetype' : 'delete'
}
</call>
@@ -1519,8 +1486,7 @@
'DNToModify' : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
'attributeName' : 'ds-privilege-name' ,
'newAttributeValue' : '-update-schema' ,
- 'changetype' : 'add' ,
- 'expectedRC' : 0
+ 'changetype' : 'add'
}
</call>
@@ -1550,8 +1516,7 @@
'DNToModify' : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
'attributeName' : 'ds-privilege-name' ,
'newAttributeValue' : '-update-schema' ,
- 'changetype' : 'delete' ,
- 'expectedRC' : 0
+ 'changetype' : 'delete'
}
</call>
@@ -1661,8 +1626,7 @@
'DNToModify' : 'dc=example,dc=com' ,
'attributeName' : 'aci' ,
'newAttributeValue' : write_aci ,
- 'changetype' : 'add' ,
- 'expectedRC' : 0
+ 'changetype' : 'add'
}
</call>
@@ -1678,8 +1642,7 @@
'DNToModify' : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
'attributeName' : 'ds-privilege-name' ,
'newAttributeValue' : '-privilege-change' ,
- 'changetype' : 'add' ,
- 'expectedRC' : 0
+ 'changetype' : 'add'
}
</call>
@@ -1712,8 +1675,7 @@
'DNToModify' : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
'attributeName' : 'ds-privilege-name' ,
'newAttributeValue' : '-privilege-change' ,
- 'changetype' : 'delete' ,
- 'expectedRC' : 0
+ 'changetype' : 'delete'
}
</call>
@@ -1729,8 +1691,7 @@
'DNToModify' : 'uid=buser,o=Privileges Tests,dc=example,dc=com' ,
'attributeName' : 'ds-privilege-name' ,
'newAttributeValue' : 'modify-acl' ,
- 'changetype' : 'add' ,
- 'expectedRC' : 0
+ 'changetype' : 'add'
}
</call>
@@ -1750,8 +1711,7 @@
'DNToModify' : 'ou=People, o=Privileges Tests, dc=example,dc=com' ,
'attributeName' : 'aci' ,
'newAttributeValue' : search_aci ,
- 'changetype' : 'add' ,
- 'expectedRC' : 0
+ 'changetype' : 'add'
}
</call>
@@ -1767,8 +1727,7 @@
'DNToModify' : 'uid=buser,o=Privileges Tests,dc=example,dc=com' ,
'attributeName' : 'ds-privilege-name' ,
'newAttributeValue' : 'modify-acl' ,
- 'changetype' : 'delete' ,
- 'expectedRC' : 0
+ 'changetype' : 'delete'
}
</call>
@@ -1784,8 +1743,7 @@
'DNToModify' : 'ou=People, o=Privileges Tests, dc=example,dc=com' ,
'attributeName' : 'aci' ,
'newAttributeValue' : search_aci ,
- 'changetype' : 'delete' ,
- 'expectedRC' : 0
+ 'changetype' : 'delete'
}
</call>
@@ -1850,8 +1808,7 @@
'DNToModify' : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
'attributeName' : 'ds-privilege-name' ,
'newAttributeValue' : '-server-shutdown' ,
- 'changetype' : 'add' ,
- 'expectedRC' : 0
+ 'changetype' : 'add'
}
</call>
@@ -1884,8 +1841,7 @@
'DNToModify' : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
'attributeName' : 'ds-privilege-name' ,
'newAttributeValue' : '-server-shutdown' ,
- 'changetype' : 'delete' ,
- 'expectedRC' : 0
+ 'changetype' : 'delete'
}
</call>
@@ -1996,8 +1952,7 @@
'DNToModify' : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
'attributeName' : 'ds-privilege-name' ,
'newAttributeValue' : '-server-restart' ,
- 'changetype' : 'add' ,
- 'expectedRC' : 0
+ 'changetype' : 'add'
}
</call>
@@ -2030,8 +1985,7 @@
'DNToModify' : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
'attributeName' : 'ds-privilege-name' ,
'newAttributeValue' : '-server-restart' ,
- 'changetype' : 'delete' ,
- 'expectedRC' : 0
+ 'changetype' : 'delete'
}
</call>
diff --git a/opends/tests/functional-tests/testcases/privileges/privileges_export_task.xml b/opends/tests/functional-tests/testcases/privileges/privileges_export_task.xml
index be976fa..55d530b 100755
--- a/opends/tests/functional-tests/testcases/privileges/privileges_export_task.xml
+++ b/opends/tests/functional-tests/testcases/privileges/privileges_export_task.xml
@@ -120,10 +120,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Export Tasks: export-ldif, user adding export task'
</message>
@@ -161,10 +157,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Export Tasks: export-ldif, user adding export task'
</message>
@@ -198,10 +190,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Export Tasks: export-ldif, Admin deleting global ACI'
</message>
@@ -217,10 +205,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Export Tasks: export-ldif, user adding export task'
</message>
@@ -303,10 +287,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Export Tasks: export-ldif, Directory Manager, DM adding export task'
</message>
@@ -340,10 +320,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Export Tasks: export-ldif, Directory Manager, DM adding export task'
</message>
@@ -404,10 +380,6 @@
'entryToBeAdded' : '%s/privileges/add_new_root_user.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Export Tasks: export-ldif, New Root User, new root user adding export task'
</message>
@@ -441,10 +413,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Export Tasks: export-ldif, New Root User, new root user adding export task'
</message>
@@ -478,10 +446,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Export Tasks: export-ldif, New Root User, new root user adding export task'
</message>
diff --git a/opends/tests/functional-tests/testcases/privileges/privileges_import_task.xml b/opends/tests/functional-tests/testcases/privileges/privileges_import_task.xml
index 3999df9..3819c55 100755
--- a/opends/tests/functional-tests/testcases/privileges/privileges_import_task.xml
+++ b/opends/tests/functional-tests/testcases/privileges/privileges_import_task.xml
@@ -118,10 +118,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Import Tasks: import-ldif, user adding import task'
</message>
@@ -159,10 +155,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Import Tasks: import-ldif, user adding import task'
</message>
@@ -196,10 +188,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Import Tasks: bypass-acl, Admin searching entry'
</message>
@@ -269,10 +257,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Import Tasks: import-ldif, Directory Manager, DM adding import task'
</message>
@@ -306,10 +290,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Import Tasks: import-ldif, Directory Manager, DM adding import task'
</message>
@@ -394,10 +374,6 @@
'entryToBeAdded' : '%s/privileges/add_new_root_user.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Import Tasks: import-ldif, New Root User, alternative root user removing privilege'
</message>
@@ -413,10 +389,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Import Tasks: import-ldif, New Root User, new root user adding import task'
</message>
@@ -450,10 +422,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Import Tasks: import-ldif, New Root User, new root user adding import task'
</message>
diff --git a/opends/tests/functional-tests/testcases/privileges/privileges_new_root_user.xml b/opends/tests/functional-tests/testcases/privileges/privileges_new_root_user.xml
index eb5e048..c1a4ed8 100644
--- a/opends/tests/functional-tests/testcases/privileges/privileges_new_root_user.xml
+++ b/opends/tests/functional-tests/testcases/privileges/privileges_new_root_user.xml
@@ -142,10 +142,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: bypass-acl, new root user searching entry'
</message>
@@ -197,10 +193,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: bypass-acl, new root user searching entry'
</message>
@@ -243,10 +235,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: bypass-acl, new root user searching entry'
</message>
@@ -298,11 +286,7 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
- <message>
+ <message>
'Privileges: New Root User: bypass-acl, new root user searching entry'
</message>
@@ -371,10 +355,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: bypass-acl, alternate bind DN, new root user searching entry'
</message>
@@ -443,11 +423,7 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
- <message>
+ <message>
'Privileges: New Root User: bypass-acl, alternate bind DN, new root user searching entry'
</message>
@@ -518,10 +494,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: modify-acl - add aci, alternative root user removing privilege'
</message>
@@ -537,10 +509,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: modify-acl - add aci, new root user adding second ACI'
</message>
@@ -577,10 +545,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: modify-acl - add aci, new root user adding second ACI'
</message>
@@ -596,10 +560,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: modify-acl - add aci, alternative root user deleting ACI'
</message>
@@ -615,10 +575,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: modify-acl - add aci, alternative root user deleting ACI'
</message>
@@ -685,10 +641,6 @@
'changetype' : 'replace' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: modify-acl - replace aci, alternative root user removing privilege'
</message>
@@ -704,10 +656,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: modify-acl - replace aci, new root user replacing ACI'
</message>
@@ -740,10 +688,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: modify-acl - replace aci, new root user replacing ACI'
</message>
@@ -809,10 +753,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: modify-acl - delete aci, alternative root user removing privilege'
</message>
@@ -828,10 +768,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: modify-acl - delete aci, new root user delete ACI'
</message>
@@ -953,10 +889,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: config-read, new root user searching cn=config'
</message>
@@ -989,10 +921,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: config-read, new root user searching cn=config'
</message>
@@ -1063,10 +991,6 @@
'changetype' : 'replace' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: config-write, alternative root user removing privilege'
</message>
@@ -1082,10 +1006,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: config-write, new root user modifying cn=config'
</message>
@@ -1118,10 +1038,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: config-write, new root user modifying cn=config'
</message>
@@ -1154,10 +1070,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: config-write, new root user modifying cn=config'
</message>
@@ -1190,10 +1102,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: config-write, new root user modifying cn=config'
</message>
@@ -1265,10 +1173,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: config-write - add global aci, alternative root user removing config-read privilege'
</message>
@@ -1284,10 +1188,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: config-write - add global aci, new root user adding ACI'
</message>
@@ -1324,10 +1224,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: config-write - add global aci, alternative root user putting back config-read privilege'
</message>
@@ -1343,10 +1239,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: config-write - add global aci, new root user adding global ACI'
</message>
@@ -1379,10 +1271,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: config-write - add global aci, new root user adding global ACI'
</message>
@@ -1398,10 +1286,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: config-write - add global aci, new root user deleting write global ACI'
</message>
@@ -1417,10 +1301,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: config-write - add global aci, new root user deleting write global ACI'
</message>
@@ -1483,10 +1363,6 @@
'changetype' : 'replace' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: password-reset, alternative root user adding privilege'
</message>
@@ -1502,10 +1378,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: password-reset, new root user resetting password'
</message>
@@ -1538,10 +1410,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: password-reset, new root user resetting password'
</message>
@@ -1620,10 +1488,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: update-schema, new root user adding new schema object'
</message>
@@ -1653,10 +1517,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: update-schema, new root user adding new schema object'
</message>
@@ -1669,10 +1529,6 @@
'entryToBeModified' : '%s/privileges/addmozobj.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: update-schema, alternate root user adding entry that users new object class'
</message>
@@ -1685,10 +1541,6 @@
'entryToBeAdded' : '%s/privileges/add_entry_with_new_objclass.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: update-schema, alternate root user searching entry'
</message>
@@ -1770,10 +1622,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: privilege-change, alternative root user removing privilege from new root user'
</message>
@@ -1789,10 +1637,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: privilege-change, new root user adding privilege to second user'
</message>
@@ -1825,10 +1669,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: privilege-change, new root user adding privilege to second user'
</message>
@@ -1844,10 +1684,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: privilege-change, second user adding ACI'
</message>
@@ -1867,10 +1703,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: privilege-change, new root user removing privilege to second user'
</message>
@@ -1886,10 +1718,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: privilege-change, alternative root user deleting ACI'
</message>
@@ -1905,10 +1733,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: privilege-change, alternative root user deleting write ACI'
</message>
@@ -1918,8 +1742,8 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'cn=Aroot' ,
'dsInstancePswd' : 'PrivsRule' ,
- 'DNToModify' : 'dc=example,dc=com' ,
- 'attributeName' : 'aci' ,
+ 'DNToModify' : 'dc=example,dc=com' ,
+ 'attributeName' : 'aci' ,
'newAttributeValue' : write_aci ,
'changetype' : 'delete' }
</call>
@@ -1973,10 +1797,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: server-shutdown, new root user adding server shutdown task'
</message>
@@ -2009,10 +1829,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: server-shutdown, new root user adding server shutdown task'
</message>
@@ -2123,10 +1939,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: server-restart, new root user adding server restart task'
</message>
@@ -2159,10 +1971,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: New Root User: server-restart, new root user adding server restart task'
</message>
diff --git a/opends/tests/functional-tests/testcases/privileges/privileges_restore_task.xml b/opends/tests/functional-tests/testcases/privileges/privileges_restore_task.xml
index 2deb446..b63f894 100755
--- a/opends/tests/functional-tests/testcases/privileges/privileges_restore_task.xml
+++ b/opends/tests/functional-tests/testcases/privileges/privileges_restore_task.xml
@@ -136,10 +136,6 @@
'entryToBeModified' : '%s/privileges/privileges_restore_task/del_entry.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Restore Tasks: backend-restore, Admin searching entry'
</message>
@@ -171,10 +167,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Restore Tasks: backend-restore, user adding restore task'
</message>
@@ -212,10 +204,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Restore Tasks: backend-restore, user adding restore task'
</message>
@@ -249,10 +237,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Restore Tasks: backend-restore, Admin searching entry'
</message>
@@ -357,10 +341,6 @@
'entryToBeModified' : '%s/privileges/privileges_restore_task/del_entry.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Restore Tasks: backend-restore, Directory Manager, alternative root user searching entry'
</message>
@@ -392,10 +372,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Restore Tasks: backend-restore, Directory Manager, DM adding restore task'
</message>
@@ -429,10 +405,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Restore Tasks: backend-restore, Directory Manager, DM adding restore task'
</message>
@@ -520,10 +492,6 @@
'entryToBeAdded' : '%s/privileges/add_new_root_user.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Restore Tasks: backend-restore, New User Root, alternative root user adding import task to create entries'
</message>
@@ -572,10 +540,6 @@
'entryToBeModified' : '%s/privileges/privileges_restore_task/del_entry.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Restore Tasks: backend-restore, New User Root, alternative root user searching entry'
</message>
@@ -607,10 +571,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Restore Tasks: backend-restore, New User Root, new root user adding restore task'
</message>
@@ -644,10 +604,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Restore Tasks: backend-restore, New User Root, new root user adding restore task'
</message>
diff --git a/opends/tests/functional-tests/testcases/privileges/privileges_users.xml b/opends/tests/functional-tests/testcases/privileges/privileges_users.xml
index d5a1a99..da5a0d9 100644
--- a/opends/tests/functional-tests/testcases/privileges/privileges_users.xml
+++ b/opends/tests/functional-tests/testcases/privileges/privileges_users.xml
@@ -129,10 +129,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: bypass-acl, user searching entry'
</message>
@@ -175,10 +171,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: bypass-acl, user searching entry'
</message>
@@ -221,11 +213,7 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
- <message>
+ <message>
'Privileges: Users: bypass-acl, user searching entry'
</message>
@@ -267,10 +255,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: bypass-acl, user searching entry'
</message>
@@ -345,10 +329,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: bypass-acl with proxy, Admin adding privilege'
</message>
@@ -364,10 +344,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: bypass-acl with proxy, user searching entry'
</message>
@@ -441,10 +417,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: bypass-acl with proxy, proxied user searching targeted entry'
</message>
@@ -487,10 +459,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: bypass-acl with proxy, Admin deleting privilege'
</message>
@@ -506,10 +474,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: bypass-acl with proxy, user searching entry'
</message>
@@ -552,10 +516,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: bypass-acl with proxy, user searching entry'
</message>
@@ -630,10 +590,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: bypass-acl with minus notation, Admin adding privilege'
</message>
@@ -649,10 +605,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: bypass-acl with minus notation, user searching entry'
</message>
@@ -695,10 +647,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: bypass-acl with minus notation, user searching entry'
</message>
@@ -741,10 +689,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: bypass-acl with minus notation, user searching entry'
</message>
@@ -787,10 +731,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: bypass-acl with minus notation, user searching entry'
</message>
@@ -833,10 +773,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: bypass-acl with minus notation, user searching entry'
</message>
@@ -906,10 +842,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: bypass-acl self-modify add, user adding privilege'
</message>
@@ -969,10 +901,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: bypass-acl self-modify add, user searching entry'
</message>
@@ -1064,10 +992,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: modify-acl - add aci, user adding ACI'
</message>
@@ -1104,10 +1028,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: modify-acl - add aci, user adding ACI'
</message>
@@ -1123,10 +1043,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: modify-acl - add aci, Admin deleting privilege'
</message>
@@ -1142,10 +1058,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: modify-acl - add aci, user adding second ACI'
</message>
@@ -1182,10 +1094,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: modify-acl - add aci, Admin deleting user-added ACI'
</message>
@@ -1201,10 +1109,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: modify-acl - add aci, user adding second ACI'
</message>
@@ -1302,10 +1206,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: modify-acl - replace aci, user replacing ACI'
</message>
@@ -1338,10 +1238,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: modify-acl - replace aci, user replacing ACI'
</message>
@@ -1357,10 +1253,6 @@
'changetype' : 'replace' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: modify-acl - replace aci, Admin deleting write ACI'
</message>
@@ -1376,10 +1268,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: modify-acl - replace aci, user replacing ACI'
</message>
@@ -1412,10 +1300,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: modify-acl - replace aci, user replacing ACI'
</message>
@@ -1503,10 +1387,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: modify-acl - delete aci, user deleting ACI'
</message>
@@ -1543,10 +1423,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: modify-acl - delete aci, user deleting ACI'
</message>
@@ -1562,10 +1438,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: modify-acl - delete aci, Admin deleting write ACI'
</message>
@@ -1581,10 +1453,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: modify-acl - delete aci, Admin deleting privilege'
</message>
@@ -1665,10 +1533,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: config-read, user searching cn=config'
</message>
@@ -1721,10 +1585,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: config-read, user searching cn=config'
</message>
@@ -1737,7 +1597,8 @@
'dsBaseDN' : 'cn=config' ,
'dsFilter' : 'objectclass=*' ,
'attributes' : 'ds-cfg-check-schema' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base' ,
+ 'expectedRC' : 50 }
</call>
<script>
@@ -1817,10 +1678,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: config-write, user modifying cn=config'
</message>
@@ -1853,10 +1710,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: config-write, user modifying cn=config'
</message>
@@ -1874,10 +1727,6 @@
}
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: config-write, Admin adding write ACI'
</message>
@@ -1897,10 +1746,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: config-write, user modifying cn=config'
</message>
@@ -1916,10 +1761,6 @@
'changetype' : 'replace' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: config-write, Admin deleting privilege'
</message>
@@ -1935,10 +1776,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: config-write, user modifying cn=config'
</message>
@@ -1971,10 +1808,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: config-write, user modifying cn=config'
</message>
@@ -2007,10 +1840,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: config-write, user modifying cn=config'
</message>
@@ -2105,10 +1934,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: config-write - add global aci, user adding ACI'
</message>
@@ -2141,10 +1966,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: config-write - add global aci, user adding ACI'
</message>
@@ -2181,10 +2002,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: config-write - add global aci, user adding ACI'
</message>
@@ -2200,10 +2017,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: config-write - add global aci, Admin deleting privilege'
</message>
@@ -2219,10 +2032,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: config-write - add global aci, user adding ACI'
</message>
@@ -2259,10 +2068,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: config-write - add global aci, user adding ACI'
</message>
@@ -2295,10 +2100,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: config-write - add global aci, Admin deleting write ACI'
</message>
@@ -2314,10 +2115,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: config-write - add global aci, user adding ACI'
</message>
@@ -2389,10 +2186,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: password-reset, check default privilege'
</message>
@@ -2425,10 +2218,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: password-reset, user resetting password'
</message>
@@ -2444,10 +2233,6 @@
'changetype' : 'replace' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: password-reset, user searching entry'
</message>
@@ -2499,10 +2284,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: password-reset, user resetting password'
</message>
@@ -2520,10 +2301,6 @@
}
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: password-reset, Admin deleting privilege'
</message>
@@ -2539,10 +2316,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: password-reset, user resetting password'
</message>
@@ -2614,10 +2387,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: update-schema, check default privilege, user adding new schema object'
</message>
@@ -2661,10 +2430,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: update-schema, user adding new schema object'
</message>
@@ -2677,10 +2442,6 @@
'entryToBeModified' : '%s/privileges/addmozobj.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: update-schema, Admin adding entry that users new object class'
</message>
@@ -2716,10 +2477,6 @@
'entryToBeAdded' : '%s/privileges/add_entry_with_new_objclass.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: password-reset, user searching entry'
</message>
@@ -2771,10 +2528,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: update-schema, Admin deleting privilege'
</message>
@@ -2842,10 +2595,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: privilege-change, Admin adding privilege to first user'
</message>
@@ -2861,10 +2610,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: privilege-change, first user adding privilege to second user'
</message>
@@ -2880,10 +2625,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: privilege-change, second user adding ACI'
</message>
@@ -2903,10 +2644,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: privilege-change, Admin deleting privilege'
</message>
@@ -2922,10 +2659,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: privilege-change, Admin deleting privilege'
</message>
@@ -2941,10 +2674,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: privilege-change, Admin deleting ACI'
</message>
@@ -2960,10 +2689,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: privilege-change, Admin deleting write ACI'
</message>
@@ -3049,10 +2774,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: server-shutdown, user adding server shutdown task'
</message>
@@ -3089,10 +2810,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: server-shutdown, user adding server shutdown task'
</message>
@@ -3151,10 +2868,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: server-shutdown, user adding server shutdown task'
</message>
@@ -3187,10 +2900,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: server-shutdown, user adding server shutdown task'
</message>
@@ -3275,10 +2984,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: server-restart, user adding server restart task'
</message>
@@ -3315,10 +3020,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: server-restart, user adding server restart task'
</message>
@@ -3351,10 +3052,7 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
+ <!--
<message>
'Privileges: Users: server-restart, user adding server restart task'
</message>
@@ -3387,10 +3085,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Privileges: Users: server-restart, user adding server restart task'
</message>
@@ -3409,7 +3103,7 @@
'result' : STAXResult ,
'expected' : 50 }
</call>
-
+ -->
<call function="'testCase_Postamble'"/>
</sequence>
--
Gitblit v1.10.0