From 6186638d4229de505a2b9d084631d4ed36938bf7 Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Thu, 27 Mar 2008 16:51:01 +0000
Subject: [PATCH] Fix privileges testcases
---
opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_users.xml | 93 +----------
opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_backup_task.xml | 59 +------
opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_unindexed_searches.xml | 7
opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_restore_task.xml | 57 ------
opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_export_task.xml | 59 +------
opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_directory_manager.xml | 50 ------
opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_new_root_user.xml | 55 ------
opendj-sdk/opends/tests/shared/functions/dsadm.xml | 72 +++++++-
8 files changed, 101 insertions(+), 351 deletions(-)
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_backup_task.xml b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_backup_task.xml
index acb857c..e216944 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_backup_task.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_backup_task.xml
@@ -95,13 +95,10 @@
'dsInstanceDn' : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'taskID' : '3' ,
- 'backupDir' : '%s/privileges/' % logsRemoteDataDir
+ 'backupDir' : '%s/privileges/' % logsRemoteDataDir ,
+ 'expectedRC' : 50
}
</call>
-
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Backup Tasks: backend-backup, Admin adding privilege'
@@ -128,13 +125,10 @@
'dsInstanceDn' : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'taskID' : '3' ,
- 'backupDir' : '%s/privileges/' % logsRemoteDataDir
+ 'backupDir' : '%s/privileges/' % logsRemoteDataDir ,
+ 'expectedRC' : 50
}
</call>
-
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Backup Tasks: backend-backup, Admin adding global ACI'
@@ -168,10 +162,6 @@
'backupDir' : '%s/privileges/' % logsRemoteDataDir
}
</call>
-
- <if expr="STAFCmdRC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Backup Tasks: backend-backup, Admin deleting privilege'
@@ -213,15 +203,10 @@
'dsInstanceDn' : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'taskID' : '3.1' ,
- 'backupDir' : '%s/privileges/' % logsRemoteDataDir
+ 'backupDir' : '%s/privileges/' % logsRemoteDataDir ,
+ 'expectedRC' : 50
}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
- </call>
<call function="'testCase_Postamble'"/>
@@ -265,10 +250,6 @@
'backupDir' : '%s/privileges/' % logsRemoteDataDir
}
</call>
-
- <if expr="STAFCmdRC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Backup Tasks: backend-backup, Directory Manager, alternative root user removing privilege'
@@ -295,13 +276,10 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'taskID' : '3.3' ,
- 'backupDir' : '%s/privileges/' % logsRemoteDataDir
+ 'backupDir' : '%s/privileges/' % logsRemoteDataDir ,
+ 'expectedRC' : 50
}
</call>
-
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Backup Tasks: backend-backup, Directory Manager, alternative root user putting back privilege'
@@ -331,11 +309,6 @@
'backupDir' : '%s/privileges/' % logsRemoteDataDir
}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : STAFCmdRC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
@@ -391,10 +364,6 @@
'backupDir' : '%s/privileges/' % logsRemoteDataDir
}
</call>
-
- <if expr="STAFCmdRC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Backup Tasks: backend-backup, New Root User, alternative root user removing privilege'
@@ -421,13 +390,10 @@
'dsInstanceDn' : 'cn=Zroot' ,
'dsInstancePswd' : 'PrivsRule' ,
'taskID' : '3.6' ,
- 'backupDir' : '%s/privileges/' % logsRemoteDataDir
+ 'backupDir' : '%s/privileges/' % logsRemoteDataDir ,
+ 'expectedRC' : 50
}
</call>
-
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Backup Tasks: backend-backup, New Root User, alternative root user putting back privilege'
@@ -457,11 +423,6 @@
'backupDir' : '%s/privileges/' % logsRemoteDataDir
}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : STAFCmdRC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_directory_manager.xml b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_directory_manager.xml
index 8b07bbf..5f10ab4 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_directory_manager.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_directory_manager.xml
@@ -527,11 +527,6 @@
'newAttributeValue' : search2_aci ,
'changetype' : 'delete' }
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
@@ -643,11 +638,6 @@
'newAttributeValue' : search_aci ,
'changetype' : 'replace' }
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
@@ -746,11 +736,6 @@
'newAttributeValue' : '-modify-acl' ,
'changetype' : 'delete' }
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
@@ -1060,11 +1045,6 @@
'newAttributeValue' : 'true' ,
'changetype' : 'replace' }
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
@@ -1266,11 +1246,6 @@
'newAttributeValue' : global2_aci ,
'changetype' : 'delete' }
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
@@ -1378,11 +1353,6 @@
'newAttributeValue' : 'pickles' ,
'changetype' : 'replace' }
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
@@ -1711,11 +1681,6 @@
'newAttributeValue' : write_aci ,
'changetype' : 'delete' }
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
@@ -1772,12 +1737,9 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'taskID' : STAXCurrentTestcase,
+ 'expectedRC' : 50
}
</call>
-
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Directory Manager: server-shutdown, alternate root user putting back privilege'
@@ -1916,12 +1878,9 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'taskID' : STAXCurrentTestcase,
+ 'expectedRC' : 50
}
</call>
-
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Directory Manager: server-restart, alternate root user putting back privilege'
@@ -1951,11 +1910,6 @@
'taskID' : STAXCurrentTestcase
}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_export_task.xml b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_export_task.xml
index 4ef202c..f325946 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_export_task.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_export_task.xml
@@ -97,13 +97,10 @@
'dsInstanceDn' : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'taskID' : '1' ,
- 'ldifFile' : '%s/privileges/export_task_out.ldif' % logsRemoteDataDir
+ 'ldifFile' : '%s/privileges/export_task_out.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
}
</call>
-
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Export Tasks: export-ldif, Admin adding privilege'
@@ -130,13 +127,10 @@
'dsInstanceDn' : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'taskID' : '1' ,
- 'ldifFile' : '%s/privileges/export_task_out.ldif' % logsRemoteDataDir
+ 'ldifFile' : '%s/privileges/export_task_out.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
}
</call>
-
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Export Tasks: export-ldif, Admin adding global ACI'
@@ -170,10 +164,6 @@
'ldifFile' : '%s/privileges/export_task_out.ldif' % logsRemoteDataDir
}
</call>
-
- <if expr="STAFCmdRC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Export Tasks: export-ldif, Admin deleting privilege'
@@ -215,15 +205,10 @@
'dsInstanceDn' : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules' ,
'taskID' : '1.1' ,
- 'ldifFile' : '%s/privileges/export_task_out2.ldif' % logsRemoteDataDir
+ 'ldifFile' : '%s/privileges/export_task_out2.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
- </call>
<call function="'testCase_Postamble'"/>
@@ -267,10 +252,6 @@
'ldifFile' : '%s/privileges/export_task_out3.ldif' % logsRemoteDataDir
}
</call>
-
- <if expr="STAFCmdRC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Export Tasks: export-ldif, Directory Manager, alternative root user removing privilege'
@@ -297,13 +278,10 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'taskID' : '1.2' ,
- 'ldifFile' : '%s/privileges/export_task_out4.ldif' % logsRemoteDataDir
+ 'ldifFile' : '%s/privileges/export_task_out4.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
}
</call>
-
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Export Tasks: export-ldif, Directory Manager, alternative root user putting back privilege'
@@ -333,11 +311,6 @@
'ldifFile' : '%s/privileges/export_task_out5.ldif' % logsRemoteDataDir
}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : STAFCmdRC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
@@ -393,10 +366,6 @@
'ldifFile' : '%s/privileges/export_task_out6.ldif' % logsRemoteDataDir
}
</call>
-
- <if expr="STAFCmdRC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Export Tasks: export-ldif, New Root User, alternative root user removing privilege'
@@ -423,13 +392,10 @@
'dsInstanceDn' : 'cn=Zroot' ,
'dsInstancePswd' : 'PrivsRule' ,
'taskID' : '1.5' ,
- 'ldifFile' : '%s/privileges/export_task_out7.ldif' % logsRemoteDataDir
+ 'ldifFile' : '%s/privileges/export_task_out7.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 50
}
</call>
-
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Export Tasks: export-ldif, New Root User, alternative root user putting back privilege'
@@ -459,11 +425,6 @@
'ldifFile' : '%s/privileges/export_task_out8.ldif' % logsRemoteDataDir
}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : STAFCmdRC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_new_root_user.xml b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_new_root_user.xml
index bd0960c..665ac96 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_new_root_user.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_new_root_user.xml
@@ -88,11 +88,6 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'entryToBeAdded' : '%s/privileges/add_new_root_user.ldif' % logsRemoteDataDir }
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
@@ -552,11 +547,6 @@
'newAttributeValue' : search2_aci ,
'changetype' : 'delete' }
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
@@ -665,11 +655,6 @@
'newAttributeValue' : search_aci ,
'changetype' : 'replace' }
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
@@ -766,11 +751,6 @@
'newAttributeValue' : '-modify-acl' ,
'changetype' : 'delete' }
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
@@ -1073,11 +1053,6 @@
'newAttributeValue' : 'true' ,
'changetype' : 'replace' }
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
@@ -1272,11 +1247,6 @@
'newAttributeValue' : global2_aci ,
'changetype' : 'delete' }
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
@@ -1381,11 +1351,6 @@
'newAttributeValue' : 'pickles' ,
'changetype' : 'replace' }
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
@@ -1701,11 +1666,6 @@
'newAttributeValue' : write_aci ,
'changetype' : 'delete' }
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
@@ -1761,12 +1721,9 @@
'dsInstanceDn' : 'cn=Zroot' ,
'dsInstancePswd' : 'PrivsRule' ,
'taskID' : STAXCurrentTestcase,
+ 'expectedRC' : 50
}
</call>
-
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: New Root User: server-shutdown, alternative root user putting back privilege'
@@ -1903,12 +1860,9 @@
'dsInstanceDn' : 'cn=Zroot' ,
'dsInstancePswd' : 'PrivsRule' ,
'taskID' : STAXCurrentTestcase,
+ 'expectedRC' : 50
}
</call>
-
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: New Root User: server-restart, alternative root user putting back privilege'
@@ -1937,11 +1891,6 @@
'taskID' : STAXCurrentTestcase
}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_restore_task.xml b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_restore_task.xml
index de38716..1affa4d 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_restore_task.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_restore_task.xml
@@ -101,10 +101,6 @@
'ldifFile' : '%s/privileges/privileges_restore_task/restore_task.ldif' % logsRemoteDataDir
}
</call>
-
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Restore Tasks: backend-restore, Admin adding backup task'
@@ -119,10 +115,6 @@
'backupDir' : '%s/privileges/privileges_restore_task/' % logsRemoteDataDir
}
</call>
-
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Restore Tasks: backend-restore, Admin deleting entry'
@@ -177,13 +169,10 @@
'dsInstanceDn' : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules',
'taskID' : '6.1',
- 'backupDir' : '%s/privileges/privileges_restore_task/' % logsRemoteDataDir
+ 'backupDir' : '%s/privileges/privileges_restore_task/' % logsRemoteDataDir,
+ 'expectedRC' : 50
}
</call>
-
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Restore Tasks: backend-restore, Admin adding global ACI'
@@ -217,10 +206,6 @@
'backupDir' : '%s/privileges/privileges_restore_task/' % logsRemoteDataDir
}
</call>
-
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Restore Tasks: backend-restore, Admin deleting global ACI'
@@ -306,10 +291,6 @@
'ldifFile' : '%s/privileges/privileges_restore_task/restore_task.ldif' % logsRemoteDataDir
}
</call>
-
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Restore Tasks: backend-restore, Directory Manager, alternative root user adding backup task'
@@ -324,10 +305,6 @@
'backupDir' : '%s/privileges/privileges_restore_task/' % logsRemoteDataDir
}
</call>
-
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Restore Tasks: backend-restore, Directory Manager, alternative root user deleting entry'
@@ -382,13 +359,10 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'taskID' : '6.4',
- 'backupDir' : '%s/privileges/privileges_restore_task/' % logsRemoteDataDir
+ 'backupDir' : '%s/privileges/privileges_restore_task/' % logsRemoteDataDir,
+ 'expectedRC' : 50
}
</call>
-
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Restore Tasks: backend-restore, Directory Manager, alternative root user putting back privilege'
@@ -418,10 +392,6 @@
'backupDir' : '%s/privileges/privileges_restore_task/' % logsRemoteDataDir
}
</call>
-
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Restore Tasks: backend-restore, Directory Manager, alternative root user searching entry'
@@ -505,10 +475,6 @@
'ldifFile' : '%s/privileges/privileges_restore_task/restore_task.ldif' % logsRemoteDataDir
}
</call>
-
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Restore Tasks: backend-restore, New User Root, new root user adding backup task'
@@ -523,10 +489,6 @@
'backupDir' : '%s/privileges/privileges_restore_task/' % logsRemoteDataDir
}
</call>
-
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Restore Tasks: backend-restore, New User Root, alternative root user deleting entry'
@@ -581,13 +543,10 @@
'dsInstanceDn' : 'cn=Zroot' ,
'dsInstancePswd' : 'PrivsRule' ,
'taskID' : '6.7',
- 'backupDir' : '%s/privileges/privileges_restore_task/' % logsRemoteDataDir
+ 'backupDir' : '%s/privileges/privileges_restore_task/' % logsRemoteDataDir,
+ 'expectedRC' : 50
}
</call>
-
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Restore Tasks: backend-restore, New User Root, alternative root user putting back privilege'
@@ -617,10 +576,6 @@
'backupDir' : '%s/privileges/privileges_restore_task/' % logsRemoteDataDir
}
</call>
-
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Restore Tasks: backend-restore, New User Root, alternative root user searching entry'
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_unindexed_searches.xml b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_unindexed_searches.xml
index cf67d70..d43e701 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_unindexed_searches.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_unindexed_searches.xml
@@ -124,13 +124,6 @@
}
</call>
- <call function="'checktestRC'">
- {
- 'returncode' : RC ,
- 'result' : STAXResult
- }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_users.xml b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_users.xml
index 32339bf..38a7e97 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_users.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_users.xml
@@ -1058,11 +1058,6 @@
'expectedRC' : 50
}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
@@ -1249,11 +1244,6 @@
'expectedRC' : 50
}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
@@ -1436,11 +1426,6 @@
'expectedRC' : 50
}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
@@ -1587,11 +1572,6 @@
'newAttributeValue' : 'modify-acl' ,
'changetype' : 'delete' }
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
@@ -2101,11 +2081,6 @@
'expectedRC' : 50
}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
@@ -2376,11 +2351,6 @@
'expectedRC' : 50
}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
@@ -2571,11 +2541,6 @@
'expectedRC' : 50
}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
@@ -2775,11 +2740,6 @@
'newAttributeValue' : 'update-schema' ,
'changetype' : 'delete' }
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
@@ -2936,11 +2896,6 @@
'newAttributeValue' : write_aci ,
'changetype' : 'delete' }
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
@@ -2985,12 +2940,9 @@
'dsInstanceDn' : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules',
'taskID' : STAXCurrentTestcase,
+ 'expectedRC' : 50
}
</call>
-
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Users: server-shutdown, Admin adding privilege'
@@ -3017,12 +2969,9 @@
'dsInstanceDn' : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules',
'taskID' : STAXCurrentTestcase,
+ 'expectedRC' : 50
}
</call>
-
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Users: server-shutdown, Admin adding ACI'
@@ -3111,12 +3060,9 @@
'dsInstanceDn' : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules',
'taskID' : STAXCurrentTestcase,
+ 'expectedRC' : 50
}
</call>
-
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Users: server-shutdown, Admin removing ACI'
@@ -3143,14 +3089,9 @@
'dsInstanceDn' : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules',
'taskID' : STAXCurrentTestcase,
+ 'expectedRC' : 50
}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
- </call>
<call function="'testCase_Postamble'"/>
@@ -3195,12 +3136,9 @@
'dsInstanceDn' : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules',
'taskID' : STAXCurrentTestcase,
+ 'expectedRC' : 50
}
</call>
-
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Users: server-restart, Admin adding privilege'
@@ -3227,12 +3165,9 @@
'dsInstanceDn' : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules',
'taskID' : STAXCurrentTestcase,
+ 'expectedRC' : 50
}
</call>
-
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Users: server-restart, Admin adding ACI'
@@ -3265,10 +3200,6 @@
'taskID' : STAXCurrentTestcase,
}
</call>
-
- <if expr="STAFCmdRC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Users: server-restart, Admin deleting privilege'
@@ -3296,12 +3227,9 @@
'dsInstanceDn' : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules',
'taskID' : STAXCurrentTestcase,
+ 'expectedRC' : 50
}
</call>
-
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Users: server-restart, Admin removing ACI'
@@ -3328,14 +3256,9 @@
'dsInstanceDn' : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules',
'taskID' : STAXCurrentTestcase,
+ 'expectedRC' : 50
}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 50 }
- </call>
-->
<call function="'testCase_Postamble'"/>
diff --git a/opendj-sdk/opends/tests/shared/functions/dsadm.xml b/opendj-sdk/opends/tests/shared/functions/dsadm.xml
index 73b3386..6785df0 100755
--- a/opendj-sdk/opends/tests/shared/functions/dsadm.xml
+++ b/opendj-sdk/opends/tests/shared/functions/dsadm.xml
@@ -1129,7 +1129,7 @@
Wildcard 'noCheck' to not check the RC
</function-arg-description>
<function-arg-property name="type" value="integer"/>
- </function-arg-def>
+ </function-arg-def>
</function-map-args>
<sequence>
@@ -1216,8 +1216,7 @@
'dsBindDn' : dsInstanceDn,
'dsBindPswd' : dsInstancePswd,
'dsTaskLdif' : taskLdif,
- 'expectedRC' : expectedRC
- }
+ 'expectedRC' : expectedRC }
</call>
<script>
@@ -1679,6 +1678,13 @@
</function-arg-description>
<function-arg-property name="type" value="option"/>
</function-arg-def>
+ <function-arg-def name="expectedRC" type="optional" default="0">
+ <function-arg-description>
+ Expected return code value. Default value is 0
+ Wildcard 'noCheck' to not check the RC
+ </function-arg-description>
+ <function-arg-property name="type" value="integer"/>
+ </function-arg-def>
</function-map-args>
<sequence>
@@ -1758,7 +1764,8 @@
'dsPort' : dsInstancePort,
'dsBindDn' : dsInstanceDn,
'dsBindPswd' : dsInstancePswd,
- 'dsTaskLdif' : taskLdif }
+ 'dsTaskLdif' : taskLdif,
+ 'expectedRC' : expectedRC }
</call>
<script>
@@ -1777,6 +1784,11 @@
'dsBindDn' : dsInstanceDn,
'dsBindPswd' : dsInstancePswd }
</call>
+ <message>'Check CheckLdapTask returns RC=0'</message>
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
</sequence>
</if>
</sequence>
@@ -2009,8 +2021,15 @@
</function-arg-description>
<function-arg-property name="type" value="boolean"/>
</function-arg-def>
+ <function-arg-def name="expectedRC" type="optional" default="0">
+ <function-arg-description>
+ Expected return code value. Default value is 0
+ Wildcard 'noCheck' to not check the RC
+ </function-arg-description>
+ <function-arg-property name="type" value="integer"/>
+ </function-arg-def>
</function-map-args>
-
+
<sequence>
<script>
@@ -2075,7 +2094,8 @@
'dsPort' : dsInstancePort,
'dsBindDn' : dsInstanceDn,
'dsBindPswd' : dsInstancePswd,
- 'dsTaskLdif' : taskLdif }
+ 'dsTaskLdif' : taskLdif,
+ 'expectedRC' : expectedRC }
</call>
<script>
@@ -2094,6 +2114,11 @@
'dsBindDn' : dsInstanceDn,
'dsBindPswd' : dsInstancePswd }
</call>
+ <message>'Check CheckLdapTask returns RC=0'</message>
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
</sequence>
</if>
</sequence>
@@ -2281,6 +2306,13 @@
</function-arg-description>
<function-arg-property name="type" value="boolean"/>
</function-arg-def>
+ <function-arg-def name="expectedRC" type="optional" default="0">
+ <function-arg-description>
+ Expected return code value. Default value is 0
+ Wildcard 'noCheck' to not check the RC
+ </function-arg-description>
+ <function-arg-property name="type" value="integer"/>
+ </function-arg-def>
</function-map-args>
<sequence>
@@ -2339,7 +2371,8 @@
'dsPort' : dsInstancePort,
'dsBindDn' : dsInstanceDn,
'dsBindPswd' : dsInstancePswd,
- 'dsTaskLdif' : taskLdif }
+ 'dsTaskLdif' : taskLdif,
+ 'expectedRC' : expectedRC }
</call>
<script>
@@ -2358,6 +2391,11 @@
'dsBindDn' : dsInstanceDn,
'dsBindPswd' : dsInstancePswd }
</call>
+ <message>'Check CheckLdapTask returns RC=0'</message>
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
</sequence>
</if>
</sequence>
@@ -2412,6 +2450,13 @@
</function-arg-description>
<function-arg-property name="type" value="string"/>
</function-arg-def>
+ <function-arg-def name="expectedRC" type="optional" default="0">
+ <function-arg-description>
+ Expected return code value. Default value is 0
+ Wildcard 'noCheck' to not check the RC
+ </function-arg-description>
+ <function-arg-property name="type" value="integer"/>
+ </function-arg-def>
</function-map-args>
<sequence>
@@ -2466,7 +2511,8 @@
'dsPort' : dsInstancePort,
'dsBindDn' : dsInstanceDn,
'dsBindPswd' : dsInstancePswd,
- 'dsTaskLdif' : taskLdif }
+ 'dsTaskLdif' : taskLdif,
+ 'expectedRC' : expectedRC }
</call>
<script>
@@ -2526,6 +2572,13 @@
</function-arg-description>
<function-arg-property name="type" value="string"/>
</function-arg-def>
+ <function-arg-def name="expectedRC" type="optional" default="0">
+ <function-arg-description>
+ Expected return code value. Default value is 0
+ Wildcard 'noCheck' to not check the RC
+ </function-arg-description>
+ <function-arg-property name="type" value="integer"/>
+ </function-arg-def>
</function-map-args>
<sequence>
@@ -2580,7 +2633,8 @@
'dsPort' : dsInstancePort,
'dsBindDn' : dsInstanceDn,
'dsBindPswd' : dsInstancePswd,
- 'dsTaskLdif' : taskLdif }
+ 'dsTaskLdif' : taskLdif,
+ 'expectedRC' : expectedRC }
</call>
<script>
--
Gitblit v1.10.0