From 2c0307531a49cb3b0f55808fe6f50e07e0c7231a Mon Sep 17 00:00:00 2001
From: smaguin <smaguin@localhost>
Date: Fri, 06 Jul 2007 16:25:56 +0000
Subject: [PATCH] WS modifications to use checktestRC
---
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_setup_pwd_policy.xml | 5
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_root_user_tests.xml | 9
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_teardown_pwd_validator.xml | 5
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml | 18
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_setup_pwd_validator.xml | 5
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml | 18
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_teardown_pwd_storage.xml | 5
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_min_pwd_age.xml | 28
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change.xml | 161 ----
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml | 29
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_grace_login.xml | 66 -
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_mult_pwd_policies.xml | 65 -
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_setup_pwd_storage.xml | 4
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml | 18
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_deprecated_schemes.xml | 26
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_disable_max_pwd_age.xml | 4
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml | 30
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml | 17
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_length.xml | 100 --
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_skip_val_for_admins.xml | 82 --
opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_cram-md5.xml | 58 -
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_enable_max_pwd_age.xml | 8
opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml | 263 -------
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_last_login.xml | 347 ----------
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_fail_cnt.xml | 57 -
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml | 22
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_preencoded_pwds.xml | 48 -
opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml | 22
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml | 18
opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_teardown_sasl.xml | 5
opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_plain.xml | 73 --
opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_setup_sasl.xml | 5
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_teardown_pwd_policy.xml | 5
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml | 18
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_user_pwd_policy.xml | 77 --
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml | 18
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml | 18
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_duration.xml | 99 --
38 files changed, 187 insertions(+), 1,669 deletions(-)
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_disable_max_pwd_age.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_disable_max_pwd_age.xml
index 97f4fe1..04b2271 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_disable_max_pwd_age.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_disable_max_pwd_age.xml
@@ -49,10 +49,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_change_max_pwd_age.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_enable_max_pwd_age.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_enable_max_pwd_age.xml
index 7edddb0..e447cda 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_enable_max_pwd_age.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_enable_max_pwd_age.xml
@@ -50,10 +50,6 @@
'entryToBeCompared' : 'cn=Default Password Policy,cn=Password Policies,cn=config' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
@@ -76,10 +72,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_change_max_pwd_age.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change.xml
index 825f1d7..a36aae1 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change.xml
@@ -49,9 +49,6 @@
'entryToBeCompared' : 'cn=Default Password Policy,cn=Password Policies,cn=config' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Pwd Change: Preamble Step 2. Admin Enabling Force Password On Add'
@@ -65,10 +62,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_change_force_pwd_add.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -89,10 +82,6 @@
'entryToBeAdded' : '%s/security/pwd_policy/add_entry1.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Pwd Change: User Searching With Password'
</message>
@@ -104,14 +93,10 @@
'dsInstancePswd' : 'pizza' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base',
+ 'expectedRC' : 19 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 19 }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -132,9 +117,7 @@
'entryToBeModified' : '%s/security/pwd_policy/user_change_force_pwd.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
+
<message>
'Security: Pwd Change: User Searching With Password'
@@ -150,10 +133,6 @@
'extraParams' : '-s base' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -174,9 +153,7 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_reset_force_pwd_add.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
+
<message>
'Security: Pwd Change: Postamble Step 2. Adding Single New User'
@@ -190,9 +167,6 @@
'entryToBeAdded' : '%s/security/pwd_policy/add_entry2.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Pwd Change: Postamble Step 3. User Searching With Password'
@@ -208,10 +182,6 @@
'extraParams' : '-s base' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -232,10 +202,7 @@
'entryToBeCompared' : 'cn=Default Password Policy,cn=Password Policies,cn=config' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
+
<message>
'Security: Pwd Change: Preamble Step 2. Admin Enabling Force Password On Reset'
</message>
@@ -248,10 +215,7 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_change_force_pwd_reset.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
+
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -272,10 +236,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_change_user_pwd.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -295,14 +255,10 @@
'dsInstancePswd' : 'pizza' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base',
+ 'expectedRC' : 49 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -320,13 +276,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=mdog,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'pizza' ,
- 'entryToBeModified' : '%s/security/pwd_policy/user_add_attr.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/security/pwd_policy/user_add_attr.ldif' % logsRemoteDataDir,
+ 'expectedRC' : 49 }
</call>
- <if expr="RC != 49">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Pwd Change: Checking For Existence of User-added Attribute'
</message>
@@ -337,14 +290,10 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'attrToBeCompared' : 'pager:+1 999 555-1212',
- 'entryToBeCompared' : 'uid=mdog,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' }
+ 'entryToBeCompared' : 'uid=mdog,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'expectedRC' : 16 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 16 }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -362,12 +311,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=mdog,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'pizza' ,
- 'entryToBeModified' : '%s/security/pwd_policy/user_del_attr.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/security/pwd_policy/user_del_attr.ldif' % logsRemoteDataDir,
+ 'expectedRC' : 49 }
</call>
- <if expr="RC != 49">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Pwd Change: Checking For Existence of User-deleted Attribute'
@@ -382,10 +329,6 @@
'entryToBeCompared' : 'uid=mdog,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -404,14 +347,10 @@
'dsInstanceDn' : 'uid=mdog,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'pizza' ,
'attrToBeCompared' : 'l:Sunnyvale',
- 'entryToBeCompared' : 'uid=mdog,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' }
+ 'entryToBeCompared' : 'uid=mdog,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'expectedRC' : 49 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -431,14 +370,10 @@
'dsInstancePswd' : 'adminpizza' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base',
+ 'expectedRC' : 19 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 19 }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -459,10 +394,6 @@
'entryToBeModified' : '%s/security/pwd_policy/user_change_pwd3.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Pwd Change: User Searching With Assigned Password'
</message>
@@ -474,12 +405,10 @@
'dsInstancePswd' : 'adminpizza' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base' ,
+ 'expectedRC' : 49 }
</call>
- <if expr="RC != 49">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Pwd Change: User Searching With New Password'
@@ -495,10 +424,7 @@
'extraParams' : '-s base' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
+
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -519,10 +445,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_enable_max_reset_age_long.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -543,10 +465,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_change_user_pwd4.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -567,9 +485,6 @@
'entryToBeModified' : '%s/security/pwd_policy/user_change_pwd7.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Pwd Change: User Searching With Password'
@@ -585,10 +500,6 @@
'extraParams' : '-s base' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -609,10 +520,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_enable_max_reset_age_short.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -633,10 +540,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_change_user_pwd5.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -662,13 +565,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=mdog,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'adminshortpizza' ,
- 'entryToBeModified' : '%s/security/pwd_policy/user_change_pwd8.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/security/pwd_policy/user_change_pwd8.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 49 }
</call>
- <if expr="RC != 49">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Pwd Change: User Searching With Password'
</message>
@@ -680,14 +580,10 @@
'dsInstancePswd' : 'newshortpizza' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base',
+ 'expectedRC' : 49 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -708,9 +604,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_disable_max_reset_age.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Pwd Change: Postamble Step 2. Admin Disabling Force Password On Reset'
@@ -724,10 +617,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_reset_force_pwd_reset.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml
index 0a4dad2..a36a75a 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml
@@ -51,9 +51,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Pwd Change: Preamble Step 2 - Admin Enabling Exp Pwd No Warning'
@@ -67,9 +64,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_enable_exp_pwd_no_warning.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Pwd Change: Preamble Step 3 -Admin Setting Pwd Time Exp'
@@ -83,10 +77,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_change_force_pwd_by_time.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -106,14 +96,10 @@
'dsInstancePswd' : 'sprain' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base',
+ 'expectedRC' : 49 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -134,10 +120,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_disable_exp_pwd_no_warning.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -188,10 +170,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_reset_force_pwd_by_time.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Pwd Change: User Searching With Password'
</message>
@@ -206,10 +184,6 @@
'extraParams' : '-s base' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_grace_login.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_grace_login.xml
index bf1e4ba..3feadde 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_grace_login.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_grace_login.xml
@@ -58,11 +58,7 @@
'changetype' : 'replace' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
@@ -91,12 +87,9 @@
'dsInstancePswd' : 'trident',
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base' ,
+ 'expectedRC' : 19 }
</call>
-
- <if expr="RC != 19">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Grace Login: Search Bind 2'
@@ -109,12 +102,9 @@
'dsInstancePswd' : 'trident',
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base',
+ 'expectedRC' : 19 }
</call>
-
- <if expr="RC != 19">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Grace Login: Search Bind 3'
@@ -127,13 +117,9 @@
'dsInstancePswd' : 'trident',
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base' ,
+ 'expectedRC' : 49 }
</call>
-
- <if expr="RC != 49">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Grace Login: Search Bind 4'
</message>
@@ -145,13 +131,8 @@
'dsInstancePswd' : 'trident',
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49}
+ 'extraParams' : '-s base',
+ 'expectedRC' : 49 }
</call>
<call function="'testCase_Postamble'"/>
@@ -174,12 +155,9 @@
'dsInstancePswd' : 'forsook',
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base' ,
+ 'expectedRC' : 19 }
</call>
-
- <if expr="RC != 19">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Grace Login: Reset Pwd, User resetting password'
@@ -195,10 +173,6 @@
'newAttributeValue' : 'newforsook' ,
'changetype' : 'replace' }
</call>
-
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Grace Login: Reset Pwd, Admin reset max password age'
@@ -215,10 +189,6 @@
'changetype' : 'replace' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Grace Login: Reset Pwd, Search Bind 2'
</message>
@@ -233,10 +203,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Grace Login: Reset Pwd, Search Bind 3'
</message>
@@ -251,11 +217,6 @@
'extraParams' : '-s base' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -286,11 +247,6 @@
'changetype' : 'replace' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_last_login.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_last_login.xml
index 4f27724..8381e33 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_last_login.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_last_login.xml
@@ -50,11 +50,6 @@
'entryToBeCompared' : 'cn=Default Password Policy,cn=Password Policies,cn=config' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -76,10 +71,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_enable_last-login-time-attr.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Last Login: User Binding With Password'
</message>
@@ -94,10 +85,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Last Login: Checking for Absence of Last Login Time'
</message>
@@ -142,10 +129,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_disable_last-login-time-attr.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Last Login: Admin Enable Last Login Format Only'
</message>
@@ -158,10 +141,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_enable_last-login-time-format.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Last Login: User Binding With Password'
</message>
@@ -176,10 +155,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Last Login: Checking for Absence of Last Login Time'
</message>
@@ -224,10 +199,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_enable_last-login-time-attr.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Last Login: User Binding With Password'
</message>
@@ -242,10 +213,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Last Login: Checking for Absence of Last Login Time'
</message>
@@ -292,10 +259,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Last Login: Long Idle Lockout Step 2. Admin Changing Idle Lockout Interval'
</message>
@@ -308,10 +271,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_change_idle_lockout_long.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Last Login: Long Idle Lockout Step 3. User Binding Before Idle Lockout'
</message>
@@ -326,9 +285,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Last Login: Long Idle Lockout Step 4. Sleep'
@@ -338,9 +294,6 @@
{ 'sleepForMilliSeconds' : 60000 }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Last Login: Long Idle Lockout Step 5. User Binding After Idle Lockout'
@@ -353,13 +306,8 @@
'dsInstancePswd' : 'destroy' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49}
+ 'extraParams' : '-s base',
+ 'expectedRC' : 49 }
</call>
<call function="'testCase_Postamble'"/>
@@ -383,9 +331,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_reset_idle_lockout_interval.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Last Login: Reset Idle Lockout Step 2. User Binding'
@@ -401,9 +346,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Last Login: Reset Idle Lockout Step 3. Sleep'
@@ -413,10 +355,6 @@
{ 'sleepForMilliSeconds' : 60000 }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Last Login: Reset Idle Lockout Step 4. User Binding'
</message>
@@ -431,11 +369,6 @@
'extraParams' : '-s base' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -459,10 +392,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Last Login: Long Idle Lockout - Password Change Override Step 2. Admin Changing Idle Lockout Interval'
</message>
@@ -475,10 +404,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_change_idle_lockout_long.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Last Login: Long Idle Lockout - Password Change Override Step 3. User Binding Before Idle Lockout'
</message>
@@ -493,9 +418,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Last Login: Long Idle Lockout Step 4. Sleep'
@@ -505,9 +427,6 @@
{ 'sleepForMilliSeconds' : 30000 }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Last Login: Long Idle Lockout - Password Change Override Step 5. User Changing Password'
@@ -521,9 +440,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_change_pwd_last_login.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Last Login: Long Idle Lockout Step 6. Sleep'
@@ -547,11 +463,6 @@
'extraParams' : '-s base' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -573,9 +484,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_reset_idle_lockout_interval.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Last Login: Reset Idle Lockout 2 Step 2. User Binding'
@@ -591,10 +499,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Last Login: Reset Idle Lockout 2 Step 3. Sleep'
</message>
@@ -603,10 +507,6 @@
{ 'sleepForMilliSeconds' : 60000 }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Last Login: Reset Idle Lockout 2 Step 4. User Binding'
</message>
@@ -621,11 +521,6 @@
'extraParams' : '-s base' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -649,9 +544,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Last Login: Long Idle Lockout - User Bind Reset Step 2. Admin Changing Idle Lockout Interval'
@@ -665,10 +557,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_change_idle_lockout_long.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Last Login: Long Idle Lockout - User Bind Reset Step 3. User Binding Before Idle Lockout'
</message>
@@ -683,9 +571,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Last Login: Long Idle Lockout - User Bind Reset Step 4. Sleep'
@@ -695,10 +580,6 @@
{ 'sleepForMilliSeconds' : 30000 }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Last Login: Long Idle Lockout - User Bind Reset Step 5. User Bind To Reset Last Login Time'
</message>
@@ -713,9 +594,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Last Login: Long Idle Lockout - User Bind Reset Step 6. Sleep'
@@ -739,11 +617,6 @@
'extraParams' : '-s base' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -765,10 +638,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_reset_idle_lockout_interval.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Last Login: Reset Idle Lockout Step 2. User Binding'
</message>
@@ -783,10 +652,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Last Login: Reset Idle Lockout Step 3. Sleep'
</message>
@@ -795,10 +660,6 @@
{ 'sleepForMilliSeconds' : 60000 }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Last Login: Reset Idle Lockout Step 4. User Binding'
</message>
@@ -813,11 +674,6 @@
'extraParams' : '-s base' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -839,10 +695,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_disable_last-login-time-attr.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Last Login: Long Idle Lockout - Disabled Last Login Step 2. Check User Bind'
</message>
@@ -857,10 +709,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Last Login: Long Idle Lockout - Disabled Last Login Step 3. Admin Changing Idle Lockout Interval'
</message>
@@ -873,10 +721,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_change_idle_lockout_long.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Last Login: Long Idle Lockout - Disabled Last Login Step 4. User Binding'
</message>
@@ -888,15 +732,10 @@
'dsInstancePswd' : 'newdestroy' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base' ,
+ 'expectedRC' : 49 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -918,10 +757,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_enable_last-login-time-attr.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Last Login: Reset Idle Lockout Step 2. Admin Resetting Idle Lockout Interval'
</message>
@@ -934,10 +769,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_reset_idle_lockout_interval.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Last Login: Reset Idle Lockout Step 3. User Binding'
</message>
@@ -952,10 +783,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Last Login: Reset Idle Lockout Step 4. Sleep'
</message>
@@ -964,10 +791,6 @@
{ 'sleepForMilliSeconds' : 60000 }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Last Login: Reset Idle Lockout Step 5. User Binding'
</message>
@@ -982,11 +805,6 @@
'extraParams' : '-s base' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -1008,10 +826,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_disable_last-login-time-format.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Last Login: Long Idle Lockout - Disabled Last Login 2 Step 2. Check User Bind'
</message>
@@ -1026,10 +840,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Last Login: Long Idle Lockout - Disabled Last Login 2 Step 3. Admin Changing Idle Lockout Interval'
</message>
@@ -1042,10 +852,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_change_idle_lockout_long.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Last Login: Long Idle Lockout - Disabled Last Login 2 Step 4. User Binding'
</message>
@@ -1057,15 +863,10 @@
'dsInstancePswd' : 'newdestroy' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base' ,
+ 'expectedRC' : 49 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -1087,10 +888,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_enable_last-login-time-format.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Last Login: Reset Idle Lockout Step 2. Admin Resetting Idle Lockout Interval'
</message>
@@ -1103,10 +900,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_reset_idle_lockout_interval.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Last Login: Reset Idle Lockout Step 3. User Binding'
</message>
@@ -1121,9 +914,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Last Login: Reset Idle Lockout Step 4. Sleep'
@@ -1133,10 +923,6 @@
{ 'sleepForMilliSeconds' : 60000 }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Last Login: Reset Idle Lockout Step 5. User Binding'
</message>
@@ -1151,11 +937,6 @@
'extraParams' : '-s base' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -1179,10 +960,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Last Login: Long Idle Lockout Step 2. Admin Changing Idle Lockout Interval'
</message>
@@ -1195,9 +972,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_change_idle_lockout_long.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Last Login: Long Idle Lockout Step 3. User Binding Before Idle Lockout'
@@ -1213,9 +987,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Last Login: Long Idle Lockout Step 4. Sleep'
@@ -1225,9 +996,6 @@
{ 'sleepForMilliSeconds' : 60000 }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Last Login: Long Idle Lockout Step 5. User Binding After Idle Lockout'
@@ -1240,15 +1008,10 @@
'dsInstancePswd' : 'newdestroy' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base' ,
+ 'expectedRC' : 49 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49}
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -1270,10 +1033,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_reset_idle_lockout_interval.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Last Login: Reset Idle Lockout Step 2. User Binding'
</message>
@@ -1288,9 +1047,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Last Login: Reset Idle Lockout Step 3. Sleep'
@@ -1300,9 +1056,6 @@
{ 'sleepForMilliSeconds' : 60000 }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Last Login: Reset Idle Lockout Step 4. User Binding'
@@ -1318,11 +1071,6 @@
'extraParams' : '-s base' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -1346,9 +1094,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Last Login: Long Idle Lockout - Pwd Change Override 2 Step 2. Admin Changing Idle Lockout Interval'
@@ -1362,10 +1107,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_change_idle_lockout_long.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Last Login: Long Idle Lockout - Pwd Change Override 2 Step 3. User Binding Before Idle Lockout'
</message>
@@ -1380,9 +1121,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Last Login: Long Idle Lockout - Pwd Change Override 2 Step 4. Sleep'
@@ -1392,10 +1130,6 @@
{ 'sleepForMilliSeconds' : 60000 }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Last Login: Long Idle Lockout - Pwd Change Override 2 Step 5. User Changing Password'
</message>
@@ -1408,9 +1142,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_change_pwd_last_login2.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Last Login: Long Idle Lockout - Pwd Change Override 2 Step 6. User Binding After Idle Lockout'
@@ -1426,11 +1157,6 @@
'extraParams' : '-s base' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -1452,9 +1178,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_reset_idle_lockout_interval.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Last Login: Reset Idle Lockout Step 2. User Binding'
@@ -1470,9 +1193,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Last Login: Reset Idle Lockout Step 3. Sleep'
@@ -1482,9 +1202,6 @@
{ 'sleepForMilliSeconds' : 60000 }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Last Login: Reset Idle Lockout Step 4. User Binding'
@@ -1500,11 +1217,6 @@
'extraParams' : '-s base' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -1526,9 +1238,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_disable_last-login-time-format.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Last Login: Long Idle Lockout - Pwd Change Override 3 Step 2. Check User Bind'
@@ -1544,9 +1253,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Last Login: Long Idle Lockout - Pwd Change Override 3 Step 3. Admin Changing Idle Lockout Interval'
@@ -1560,10 +1266,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_change_idle_lockout_long.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Last Login: Long Idle Lockout - Pwd Change Override 3 Step 4. User Binding Before Idle Lockout'
</message>
@@ -1575,13 +1277,10 @@
'dsInstancePswd' : 'anotherdestroy' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base' ,
+ 'expectedRC' : 49 }
</call>
- <if expr="RC != 49">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Last Login: Long Idle Lockout - Pwd Change Override 3 Step 5. Admin Changing Password'
</message>
@@ -1594,10 +1293,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_change_pwd_last_login3.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Last Login: Pwd Override 3 Step 6. User Binding After Admin Pwd Change'
</message>
@@ -1612,11 +1307,6 @@
'extraParams' : '-s base' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -1638,9 +1328,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_reset_idle_lockout_interval.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Last Login: Postamble Step 2. Admin Disabling Last Login Time Attribute'
@@ -1654,9 +1341,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_disable_last-login-time-attr.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Last Login: Postamble Step 3. User Binding'
@@ -1672,9 +1356,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Last Login: Postamble Step 4. Sleep'
@@ -1684,9 +1365,6 @@
{ 'sleepForMilliSeconds' : 60000 }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Last Login: Postamble Step 5. User Binding'
@@ -1702,11 +1380,6 @@
'extraParams' : '-s base' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_duration.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_duration.xml
index 8533aa4..689d95c 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_duration.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_duration.xml
@@ -49,10 +49,6 @@
'entryToBeCompared' : 'cn=Default Password Policy,cn=Password Policies,cn=config' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Lockout Duration: Preamble Step 2. Admin Changing Lockout Count'
</message>
@@ -65,10 +61,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_change_lockout_cnt.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Lockout Duration: Preamble Step 3. User Lockout With Bad Pwd 3x'
</message>
@@ -85,14 +77,11 @@
'dsInstancePswd' : '%s' % pwds,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base' ,
+ 'expectedRC' : 49 }
</call>
</iterate>
- <if expr="RC != 49">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Lockout Duration: Preamble Step 4. Admin Resetting User Pwd'
</message>
@@ -105,10 +94,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_change_user_pwd2.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Lockout Duration: Preamble Step 5. User Bind With New Password'
</message>
@@ -123,11 +108,6 @@
'extraParams' : '-s base' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -149,11 +129,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_change_lockout_dur_short.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -179,14 +154,11 @@
'dsInstancePswd' : '%s' % pwds,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base' ,
+ 'expectedRC' : 49 }
</call>
</iterate>
- <if expr="RC != 49">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Lockout Duration: Short Lockout Duration - Sleeping'
</message>
@@ -207,10 +179,6 @@
'entryToBeModified' : '%s/security/pwd_policy/user_change_pwd5.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Lockout Duration: Short Lockout Duration Step 3. User Bind With New Password'
</message>
@@ -225,11 +193,6 @@
'extraParams' : '-s base' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -251,11 +214,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_change_lockout_dur_long.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -279,10 +237,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Lockout Duration: Long Lockout Duration Step 2. User Lockout With Bad Pwd 3x'
</message>
@@ -299,14 +253,11 @@
'dsInstancePswd' : '%s' % pwds,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base' ,
+ 'expectedRC' : 49 }
</call>
</iterate>
- <if expr="RC != 49">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Lockout Duration: Long Lockout Duration - Sleeping'
</message>
@@ -324,12 +275,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=bjablons,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'strawberry' ,
- 'entryToBeModified' : '%s/security/pwd_policy/user_change_pwd6.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/security/pwd_policy/user_change_pwd6.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 49 }
</call>
- <if expr="RC != 49">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Lockout Duration: Long Lockout Duration Step 4. User Bind With New Password'
@@ -342,15 +291,10 @@
'dsInstancePswd' : 'newberry' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base',
+ 'expectedRC' : 49 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -371,10 +315,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_reset_lockout_dur.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Lockout Duration: Postamble Step 2. User Lockout With Bad Pwd 3x'
</message>
@@ -391,14 +331,11 @@
'dsInstancePswd' : '%s' % pwds,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base' ,
+ 'expectedRC' : 49 }
</call>
</iterate>
- <if expr="RC != 49">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Lockout Duration: Postamble Step 3. Admin Resetting User Pwd'
</message>
@@ -411,9 +348,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_change_user_pwd3.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Lockout Duration: Postamble Step 4. User Bind With New Password'
@@ -429,10 +363,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Lockout Duration: Postamble Step 5. Admin Resetting Lockout Count'
</message>
@@ -445,11 +375,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_reset_lockout_cnt.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_fail_cnt.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_fail_cnt.xml
index 5facfa1..c1f3aae 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_fail_cnt.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_fail_cnt.xml
@@ -50,16 +50,12 @@
'entryToBeCompared' : 'cn=Default Password Policy,cn=Password Policies,cn=config' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Lockout Fail Cnt: Preamble Step 2. Default Bind With Bad Pwd 3x'
</message>
<script>
- search_pwds = ['bad', 'bad', 'bad', 'oranges']
+ search_pwds = ['bad', 'bad', 'bad']
</script>
<iterate var="pwds" in="search_pwds" indexvar="index">
@@ -70,15 +66,20 @@
'dsInstancePswd' : '%s' % pwds,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base' ,
+ 'expectedRC' : 49 }
</call>
</iterate>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
+ <call function="'SearchObject'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=bhall,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'oranges',
+ 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'extraParams' : '-s base' }
</call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -100,11 +101,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_change_lockout_cnt.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -130,16 +126,11 @@
'dsInstancePswd' : '%s' % pwds,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base' ,
+ 'expectedRC' : 49 }
</call>
</iterate>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49}
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -176,16 +167,12 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Lockout Fail Cnt: Postamble Step 3. Check Bind With Bad Pwd 3x'
</message>
<script>
- search_pwds = ['bad', 'bad', 'bad', 'ruling']
+ search_pwds = ['bad', 'bad', 'bad']
</script>
<iterate var="pwds" in="search_pwds" indexvar="index">
@@ -196,15 +183,21 @@
'dsInstancePswd' : '%s' % pwds,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base',
+ 'expectedRC' : 49 }
</call>
</iterate>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
+ <call function="'SearchObject'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=gfarmer,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'ruling',
+ 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'extraParams' : '-s base'}
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_min_pwd_age.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_min_pwd_age.xml
index 31a93e9..425166f 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_min_pwd_age.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_min_pwd_age.xml
@@ -50,11 +50,6 @@
'entryToBeCompared' : 'cn=Default Password Policy,cn=Password Policies,cn=config' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -86,7 +81,8 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=dmiller,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'gosling' ,
- 'entryToBeModified' : '%s/security/pwd_policy/user_change_pwd4.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/security/pwd_policy/user_change_pwd4.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 53 }
</call>
<!--- User Search With Password -->
@@ -101,15 +97,9 @@
'dsInstancePswd' : 'newgosling' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base' ,
+ 'expectedRC' : 49 }
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -159,11 +149,6 @@
'extraParams' : '-s base' }
</call>
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<!--- User Change Password -->
<message>
'Security: Min Pwd Age: Postamble Reset: Step 4. User Changing Password'
@@ -192,11 +177,6 @@
'extraParams' : '-s base' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_mult_pwd_policies.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_mult_pwd_policies.xml
index 8d60b50..2e0b76f 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_mult_pwd_policies.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_mult_pwd_policies.xml
@@ -49,11 +49,6 @@
'entryToBeAdded' : '%s/security/pwd_policy/sales_pwd_policy.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -75,10 +70,6 @@
'entryToBeAdded' : '%s/security/pwd_policy/add_sales_person.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'SearchObject'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
@@ -89,10 +80,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'SearchObject'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
@@ -103,11 +90,6 @@
'extraParams' : '-s base' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -129,11 +111,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_change_lockout_cnt_sales.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -160,16 +137,10 @@
'dsInstancePswd' : '%s' % pwds ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base' ,
+ 'expectedRC' : 49 }
</call>
</iterate>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49}
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -184,7 +155,7 @@
</message>
<script>
- search_pwds = ['bad', 'bad', 'bad', 'cardreader']
+ search_pwds = ['bad', 'bad', 'bad']
</script>
<iterate var="pwds" in="search_pwds" indexvar="index">
@@ -195,15 +166,21 @@
'dsInstancePswd' : '%s' % pwds ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base' ,
+ 'expectedRC' : 49 }
</call>
</iterate>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
+ <call function="'SearchObject'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=tclow,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'cardreaders' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'extraParams' : '-s base' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
@@ -225,11 +202,6 @@
'entryToBeModified' : '%s/security/pwd_policy/rm_sales_pwd_policy.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -250,13 +222,8 @@
'dsInstancePswd' : 'supergal' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 80 }
+ 'extraParams' : '-s base' ,
+ 'expectedRC' : 80 }
</call>
<call function="'testCase_Postamble'"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_preencoded_pwds.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_preencoded_pwds.xml
index 4737d15..31664b0 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_preencoded_pwds.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_preencoded_pwds.xml
@@ -50,11 +50,6 @@
'entryToBeCompared' : 'cn=Default Password Policy,cn=Password Policies,cn=config' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -73,13 +68,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/pwd_policy/add_entry_preencoded_pwd.ldif' % logsRemoteDataDir }
+ 'entryToBeAdded' : '%s/security/pwd_policy/add_entry_preencoded_pwd.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 19 }
</call>
- <if expr="RC != 19">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'SearchObject'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
@@ -87,15 +79,10 @@
'dsInstancePswd' : 'superguy' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base' ,
+ 'expectedRC' : 49 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49}
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -117,11 +104,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_enable_preencoded_pwds.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -144,10 +126,6 @@
'entryToBeAdded' : '%s/security/pwd_policy/add_entry_preencoded_pwd.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'SearchObject'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
@@ -158,11 +136,6 @@
'extraParams' : '-s base' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -184,10 +157,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_disable_preencoded_pwds.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<call function="'SearchObject'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
@@ -195,15 +164,10 @@
'dsInstancePswd' : 'supergal' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base' ,
+ 'expectedRC' : 49 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49}
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_setup_pwd_policy.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_setup_pwd_policy.xml
index db85bd3..c488927 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_setup_pwd_policy.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_setup_pwd_policy.xml
@@ -49,11 +49,6 @@
'entryToBeAdded' : '%s/security/pwd_policy/pwd_policy_startup.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_teardown_pwd_policy.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_teardown_pwd_policy.xml
index fa5e6dd..4fc7a2a 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_teardown_pwd_policy.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_teardown_pwd_policy.xml
@@ -51,11 +51,6 @@
'extraParams' : '-x'}
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_user_pwd_policy.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_user_pwd_policy.xml
index bd9e9a1..8fae0f6 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_user_pwd_policy.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_user_pwd_policy.xml
@@ -49,11 +49,6 @@
'entryToBeCompared' : 'cn=Default Password Policy,cn=Password Policies,cn=config' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -77,11 +72,6 @@
'extraParams' : '-s base' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -102,15 +92,10 @@
'dsInstancePswd' : 'newsprain' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base' ,
+ 'expectedRC' : 49 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -129,15 +114,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=scarter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'BadPwd' ,
- 'entryToBeModified' : '%s/security/pwd_policy/user_change_pwd.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/security/pwd_policy/user_change_pwd.ldif' % logsRemoteDataDir,
+ 'expectedRC' : 49 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -159,10 +139,6 @@
'entryToBeModified' : '%s/security/pwd_policy/user_change_pwd.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Pwd Policy: User Searching With Old Password'
</message>
@@ -174,13 +150,10 @@
'dsInstancePswd' : 'sprain' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base' ,
+ 'expectedRC' : 49 }
</call>
- <if expr="RC != 49">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Pwd Policy: User Searching With New Password'
</message>
@@ -195,11 +168,6 @@
'extraParams' : '-s base' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -221,10 +189,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_change_pwd_policy.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Pwd Policy: User Resetting Password'
</message>
@@ -234,15 +198,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=scarter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'sprain' ,
- 'entryToBeModified' : '%s/security/pwd_policy/user_reset_pwd.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/security/pwd_policy/user_reset_pwd.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 49 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49}
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -264,10 +223,6 @@
'entryToBeModified' : '%s/security/pwd_policy/admin_reset_pwd_policy.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Pwd Policy: Postamble Step 2 - User Resetting Password'
</message>
@@ -280,10 +235,6 @@
'entryToBeModified' : '%s/security/pwd_policy/user_reset_pwd.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Pwd Policy: Postamble Step 3 - User Searching With Old Password'
</message>
@@ -295,13 +246,10 @@
'dsInstancePswd' : 'newsprain' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base' ,
+ 'expectedRC' : 49 }
</call>
- <if expr="RC != 49">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Pwd Policy: Postamble Step 4 - User Searching With New Password'
</message>
@@ -316,11 +264,6 @@
'extraParams' : '-s base' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_root_user_tests.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_root_user_tests.xml
index 3c40a55..c951373 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_root_user_tests.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_root_user_tests.xml
@@ -79,15 +79,10 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'attrToBeCompared' : 'ds-cfg-password-generator-dn:cn=anything',
- 'entryToBeCompared' : 'cn=Root Password Policy,cn=Password Policies,cn=config' }
+ 'entryToBeCompared' : 'cn=Root Password Policy,cn=Password Policies,cn=config',
+ 'expectedRC' : 16 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 16 }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_deprecated_schemes.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_deprecated_schemes.xml
index 04c6b4f..d095081 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_deprecated_schemes.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_deprecated_schemes.xml
@@ -72,9 +72,6 @@
'entryToBeModified' : '%s/security/pwd_storage/admin_add_many_schemes.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Deprecated Pwd Schemes: Preamble Step 2. User Change Password'
@@ -88,10 +85,6 @@
'entryToBeModified' : '%s/security/pwd_storage/user_change_pwd_depr_schemes.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Deprecating Pwd Schemes: Preamble Step 3. Checking for MD5 Scheme Before Deprecating'
</message>
@@ -150,10 +143,6 @@
'entryToBeModified' : '%s/security/pwd_storage/admin_depr_MD5.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Deprecated Pwd Schemes: Admin Removing MD5 Scheme From Default'
</message>
@@ -166,11 +155,6 @@
'entryToBeModified' : '%s/security/pwd_storage/admin_delete_MD5.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -207,11 +191,6 @@
'extraParams' : '-s base' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -379,11 +358,6 @@
'entryToBeModified' : '%s/security/pwd_storage/admin_reset_SSHA.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml
index 440a95f..c35b218 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml
@@ -68,11 +68,6 @@
'entryToBeModified' : '%s/security/pwd_storage/admin_add_BASE64.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -205,10 +200,6 @@
'entryToBeModified' : '%s/security/pwd_storage/user_change_pwd_mult_schemes.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Multiple Pwd Schemes: User Binding With New Password'
</message>
@@ -223,9 +214,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Multiple Pwd Schemes: Checking for SSHA Scheme On New Password'
@@ -330,14 +318,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=bhall,ou=people,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'manyoranges' ,
- 'entryToBeModified' : '%s/security/pwd_storage/user_add_pwd.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/security/pwd_storage/user_add_pwd.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 53 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 53 }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -370,10 +354,6 @@
'entryToBeModified' : '%s/security/pwd_storage/admin_reset_SSHA.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Multiple Pwd Schemes: User Bind Final'
</message>
@@ -388,11 +368,6 @@
'extraParams' : '-s base' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml
index 04def00..803295b 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml
@@ -68,11 +68,6 @@
'entryToBeModified' : '%s/security/pwd_storage/admin_change_BASE64.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -111,10 +106,6 @@
'entryToBeModified' : '%s/security/pwd_storage/user_change_pwd_BASE64.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Pwd Storage BASE64: User Binding With New Password'
</message>
@@ -129,10 +120,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Pwd Storage BASE64: Checking for BASE64 Scheme On New Password'
</message>
@@ -190,11 +177,6 @@
'entryToBeModified' : '%s/security/pwd_storage/admin_reset_SSHA.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml
index 8c31bcc..e740eaf 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml
@@ -68,11 +68,6 @@
'entryToBeModified' : '%s/security/pwd_storage/admin_change_CLEAR.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -110,9 +105,6 @@
'entryToBeModified' : '%s/security/pwd_storage/user_change_pwd_CLEAR.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: Pwd Storage CLEAR: User Binding With New Password'
@@ -128,10 +120,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Pwd Storage CLEAR: Checking for CLEAR Scheme On New Password'
</message>
@@ -231,11 +219,6 @@
'entryToBeModified' : '%s/security/pwd_storage/admin_reset_SSHA.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml
index 04100f0..e5460a2 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml
@@ -68,11 +68,6 @@
'entryToBeModified' : '%s/security/pwd_storage/admin_change_MD5.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -111,10 +106,6 @@
'entryToBeModified' : '%s/security/pwd_storage/user_change_pwd_MD5.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Pwd Storage MD5: User Binding With New Password'
</message>
@@ -129,10 +120,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Pwd Storage MD5: Checking for MD5 Scheme On New Password'
</message>
@@ -190,11 +177,6 @@
'entryToBeModified' : '%s/security/pwd_storage/admin_reset_SSHA.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml
index 6deac44..5105e5b 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml
@@ -68,11 +68,6 @@
'entryToBeModified' : '%s/security/pwd_storage/admin_change_SHA.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -111,10 +106,6 @@
'entryToBeModified' : '%s/security/pwd_storage/user_change_pwd_SHA.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Pwd Storage SHA: User Binding With New Password'
</message>
@@ -129,10 +120,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Pwd Storage SHA: Checking for SHA Scheme On New Password'
</message>
@@ -190,11 +177,6 @@
'entryToBeModified' : '%s/security/pwd_storage/admin_reset_SSHA.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml
index c63dc53..570029d 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml
@@ -68,11 +68,6 @@
'entryToBeModified' : '%s/security/pwd_storage/admin_change_SMD5.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -111,10 +106,6 @@
'entryToBeModified' : '%s/security/pwd_storage/user_change_pwd_SMD5.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Pwd Storage SMD5: User Binding With New Password'
</message>
@@ -129,10 +120,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Pwd Storage SMD5: Checking for SMD5 Scheme On New Password'
</message>
@@ -190,11 +177,6 @@
'entryToBeModified' : '%s/security/pwd_storage/admin_reset_SSHA.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml
index 6bd225e..9271f1a 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml
@@ -70,11 +70,6 @@
'entryToBeCompared' : 'cn=Default Password Policy,cn=Password Policies,cn=config' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -157,10 +152,6 @@
'entryToBeModified' : '%s/security/pwd_storage/user_change_pwd_SSHA.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Pwd Storage SSHA: User Binding With New Password'
</message>
@@ -175,10 +166,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Pwd Storage SSHA: Checking for SSHA Scheme On New Password'
</message>
@@ -232,15 +219,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_storage/admin_change_BAD.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/security/pwd_storage/admin_change_BAD.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 53 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 53 }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml
index 5b30215..de0dc3f 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml
@@ -68,11 +68,6 @@
'entryToBeModified' : '%s/security/pwd_storage/admin_change_SSHA256.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -110,10 +105,6 @@
'entryToBeModified' : '%s/security/pwd_storage/user_change_pwd_SSHA256.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Pwd Storage SSHA256: User Binding With New Password'
</message>
@@ -128,10 +119,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Pwd Storage SSHA256: Checking for SSHA256 Scheme On New Password'
</message>
@@ -189,11 +176,6 @@
'entryToBeModified' : '%s/security/pwd_storage/admin_reset_SSHA.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml
index 0744325..18afc38 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml
@@ -68,11 +68,6 @@
'entryToBeModified' : '%s/security/pwd_storage/admin_change_SSHA384.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -110,10 +105,6 @@
'entryToBeModified' : '%s/security/pwd_storage/user_change_pwd_SSHA384.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Pwd Storage SSHA384: User Binding With New Password'
</message>
@@ -128,10 +119,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Pwd Storage SSHA384: Checking for SSHA384 Scheme On New Password'
</message>
@@ -189,11 +176,6 @@
'entryToBeModified' : '%s/security/pwd_storage/admin_reset_SSHA.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml
index 06ff084..ef65e17 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml
@@ -68,11 +68,6 @@
'entryToBeModified' : '%s/security/pwd_storage/admin_change_SSHA512.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -111,10 +106,6 @@
'entryToBeModified' : '%s/security/pwd_storage/user_change_pwd_SSHA512.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Pwd Storage SSHA512: User Binding With New Password'
</message>
@@ -129,10 +120,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Pwd Storage SSHA512: Checking for SSHA512 Scheme On New Password'
</message>
@@ -190,11 +177,6 @@
'entryToBeModified' : '%s/security/pwd_storage/admin_reset_SSHA.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_setup_pwd_storage.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_setup_pwd_storage.xml
index cbba609..fc0f6ec 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_setup_pwd_storage.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_setup_pwd_storage.xml
@@ -72,10 +72,6 @@
'entryToBeAdded' : '%s/security/pwd_storage/pwd_storage_startup.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_teardown_pwd_storage.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_teardown_pwd_storage.xml
index e188895..e9e7860 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_teardown_pwd_storage.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_teardown_pwd_storage.xml
@@ -69,11 +69,6 @@
'extraParams' : '-x'}
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_length.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_length.xml
index 26fec65..55cc0b5 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_length.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_length.xml
@@ -50,10 +50,6 @@
'entryToBeCompared' : 'cn=Length-Based Password Validator,cn=Password Validators,cn=config' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<!--- Admin Enable Pwd Length Validator -->
<message>
'Security: Pwd Length Min: Preamble Step 2. Admin Enabling Pwd Length Validator'
@@ -67,11 +63,6 @@
'entryToBeModified' : '%s/security/pwd_validator/admin_enable_pwd_length_validator.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -90,13 +81,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=bhall,ou=people,ou=password tests,o=Pwd Validator Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'oranges' ,
- 'entryToBeModified' : '%s/security/pwd_validator/user_change_pwd_too_short.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/security/pwd_validator/user_change_pwd_too_short.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 53 }
</call>
- <if expr="RC != 53">
- <tcstatus result="'fail'"/>
- </if>
-
<!--- User Search With Password -->
<message>
'Security: Pwd Length Min: Pwd Too Short 1 Step 2. User Searching With Password'
@@ -109,15 +97,10 @@
'dsInstancePswd' : 'grape' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base',
+ 'expectedRC' : 49 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -139,11 +122,6 @@
'entryToBeModified' : '%s/security/pwd_validator/admin_change_min_pwd_length.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -162,13 +140,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=bhall,ou=people,ou=password tests,o=Pwd Validator Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'oranges' ,
- 'entryToBeModified' : '%s/security/pwd_validator/user_change_pwd_too_short2.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/security/pwd_validator/user_change_pwd_too_short2.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 53 }
</call>
- <if expr="RC != 53">
- <tcstatus result="'fail'"/>
- </if>
-
<!--- User Search With Password -->
<message>
'Security: Pwd Length Min: Pwd Too Short 2 Step 2. User Searching With Password'
@@ -181,13 +156,8 @@
'dsInstancePswd' : 'goo' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
+ 'extraParams' : '-s base' ,
+ 'expectedRC' : 49 }
</call>
<call function="'testCase_Postamble'"/>
@@ -211,9 +181,6 @@
'entryToBeModified' : '%s/security/pwd_validator/user_change_pwd_too_short.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<!--- User Search With Password -->
<message>
@@ -230,11 +197,6 @@
'extraParams' : '-s base' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -256,11 +218,6 @@
'entryToBeModified' : '%s/security/pwd_validator/admin_reset_min_pwd_length.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -282,9 +239,6 @@
'entryToBeCompared' : 'cn=Length-Based Password Validator,cn=Password Validators,cn=config' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<!--- Admin Change Maximum Pwd Length -->
<message>
@@ -299,11 +253,6 @@
'entryToBeModified' : '%s/security/pwd_validator/admin_change_max_pwd_length.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -322,13 +271,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=bhall,ou=people,ou=password tests,o=Pwd Validator Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'grape' ,
- 'entryToBeModified' : '%s/security/pwd_validator/user_change_pwd_too_long.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/security/pwd_validator/user_change_pwd_too_long.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 53 }
</call>
- <if expr="RC != 53">
- <tcstatus result="'fail'"/>
- </if>
-
<!--- User Search With Password -->
<message>
'Security: Pwd Length Max: Pwd Too Long 1 Step 2. User Searching With Password'
@@ -341,15 +287,10 @@
'dsInstancePswd' : 'pomegranates' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base' ,
+ 'expectedRC' : 49 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -371,10 +312,6 @@
'entryToBeModified' : '%s/security/pwd_validator/user_change_pwd_too_long2.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<!--- User Search With Password -->
<message>
'Security: Pwd Length Max: User Change Password Step 2. User Searching With Password'
@@ -390,11 +327,6 @@
'extraParams' : '-s base' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -416,9 +348,6 @@
'entryToBeModified' : '%s/security/pwd_validator/admin_reset_max_pwd_length.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<!--- User Change Password -->
<message>
@@ -433,11 +362,6 @@
'entryToBeModified' : '%s/security/pwd_validator/user_change_pwd_too_long.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_setup_pwd_validator.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_setup_pwd_validator.xml
index 010d66b..c18c0d8 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_setup_pwd_validator.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_setup_pwd_validator.xml
@@ -49,11 +49,6 @@
'entryToBeAdded' : '%s/security/pwd_validator/pwd_validator_startup.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_skip_val_for_admins.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_skip_val_for_admins.xml
index 2961717..aaee337 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_skip_val_for_admins.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_skip_val_for_admins.xml
@@ -52,9 +52,6 @@
'entryToBeAdded' : '%s/security/pwd_validator/add_sales_admin.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<!--- Admin Enable Pwd Length Validator -->
<message>
@@ -69,11 +66,6 @@
'entryToBeModified' : '%s/security/pwd_validator/admin_enable_pwd_length_validator.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -92,13 +84,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_validator/root_change_pwd_too_short.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/security/pwd_validator/root_change_pwd_too_short.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 53 }
</call>
- <if expr="RC != 53">
- <tcstatus result="'fail'"/>
- </if>
-
<!--- Root Search With Password -->
<message>
'Security: Root User Bypass Valid: No Bypass - Step 2. Root Searching With Password'
@@ -111,15 +100,10 @@
'dsInstancePswd' : 'grape' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base' ,
+ 'expectedRC' : 49 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -141,10 +125,6 @@
'entryToBeModified' : '%s/security/pwd_validator/admin_enable_bypass_pwd_validator.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Root User Bypass Valid: Bypass Enabled 1 - Step 2. Root Changing Password - Too Short'
</message>
@@ -157,10 +137,6 @@
'entryToBeModified' : '%s/security/pwd_validator/root_change_pwd_too_short.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<!--- Root Search With Password -->
<message>
'Security: Root User Bypass Valid: Bypass Enabled 1 - Step 3. Root Searching With Password'
@@ -176,11 +152,6 @@
'extraParams' : '-s base' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -202,9 +173,6 @@
'entryToBeModified' : '%s/security/pwd_validator/admin_change_min_pwd_length.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<!--- User Change Password - Too Short-->
<message>
@@ -219,10 +187,6 @@
'entryToBeModified' : '%s/security/pwd_validator/root_change_pwd_too_short2.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<!--- Root Search With Password -->
<message>
'Security: Root User Bypass Valid: Bypass Enabled 2 - Step 3. Root Searching With Password'
@@ -238,11 +202,6 @@
'extraParams' : '-s base' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -264,13 +223,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'cn=Sales Admin' ,
'dsInstancePswd' : 'goo' ,
- 'entryToBeModified' : '%s/security/pwd_validator/root_change_pwd_too_short3.ldif' % logsRemoteDataDir }
+ 'entryToBeModified' : '%s/security/pwd_validator/root_change_pwd_too_short3.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 53 }
</call>
- <if expr="RC != 53">
- <tcstatus result="'fail'"/>
- </if>
-
<!--- Root Search With Password -->
<message>
'Security: Root User Bypass Valid: Self-Change Pwd - Step 2. Root Searching With Password'
@@ -283,15 +239,10 @@
'dsInstancePswd' : 'gaa' ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
+ 'extraParams' : '-s base' ,
+ 'expectedRC' : 49 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -316,10 +267,6 @@
'entryToBeModified' : '%s/security/pwd_validator/delete_sales_admin.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<!--- Root Search With Original Password -->
<message>
'Security: Root User Bypass Valid: Postamble - Step 2. Admin Disabling Bypass For Pwd Validator'
@@ -333,10 +280,6 @@
'entryToBeModified' : '%s/security/pwd_validator/admin_disable_bypass_pwd_validator.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Root User Bypass Valid: Postamble - Step 3. Admin Resetting Minimum Pwd Length'
</message>
@@ -349,10 +292,6 @@
'entryToBeModified' : '%s/security/pwd_validator/admin_reset_min_pwd_length.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: Root User Bypass Valid: Postamble - Step 4. Admin Disabling Pwd Length Validator On Root Users'
</message>
@@ -365,11 +304,6 @@
'entryToBeModified' : '%s/security/pwd_validator/admin_disable_pwd_length_validator.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_teardown_pwd_validator.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_teardown_pwd_validator.xml
index 6c35bd2..8c14e5e 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_teardown_pwd_validator.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_teardown_pwd_validator.xml
@@ -52,11 +52,6 @@
'extraParams' : '-x'}
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml
index a1a8f28..e851c00 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml
@@ -67,11 +67,6 @@
'entryToBeModified' : '%s/security/sasl/admin_enable_sasl_anon.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -105,11 +100,6 @@
'extraParams' : '-o mech=ANONYMOUS -o trace=Trace -s base' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -145,9 +135,6 @@
'entryToBeModified' : '%s/security/sasl/admin_disable_sasl_anon.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Security: SASL ANON: Anonymous Bind After ANONYMOUS SASL Mechanism Disabled'
@@ -158,13 +145,8 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-o mech=ANONYMOUS -o trace=Trace -s base' }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 7 }
+ 'extraParams' : '-o mech=ANONYMOUS -o trace=Trace -s base' ,
+ 'expectedRC' : 7 }
</call>
<call function="'testCase_Postamble'"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_cram-md5.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_cram-md5.xml
index f4d5d97..905bc9c 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_cram-md5.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_cram-md5.xml
@@ -69,10 +69,6 @@
'entryToBeModified' : '%s/security/sasl/admin_change_CLEAR.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: SASL CRAM-MD5: Preamble Step 2 - Admin Changing User Password'
</message>
@@ -85,11 +81,6 @@
'entryToBeModified' : '%s/security/sasl/admin_change_user_pwd.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -123,11 +114,6 @@
'extraParams' : '-o mech=CRAM-MD5 -o authid=u:jrunner -w frogleg' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -161,10 +147,6 @@
'extraParams' : '-o mech=CRAM-MD5 -o "authid=dn:uid=jrunner,ou=People,o=SASL Tests,dc=example,dc=com" -w frogleg' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
@@ -196,15 +178,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-o mech=CRAM-MD5 -o authid=u:jcrawler -w frogleg' }
+ 'extraParams' : '-o mech=CRAM-MD5 -o authid=u:jcrawler -w frogleg' ,
+ 'expectedRC' : 49 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -238,11 +215,6 @@
'extraParams' : '-o mech=CRAM-MD5 -o "authid=dn:uid=jcrawler,ou=People,o=SASL Tests,dc=example,dc=com" -w frogleg' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -278,10 +250,6 @@
'dsBaseDN' : 'uid=jcrawler,ou=People,ou=Level One,o=SASL Tests,dc=example,dc=com' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: SASL CRAM-MD5: User With Duplicate uid (u:) Binding With CRAM-MD5 SASL Mechanism'
</message>
@@ -294,11 +262,6 @@
'extraParams' : '-o mech=CRAM-MD5 -o authid=u:jcrawler -w frogleg' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -337,10 +300,6 @@
'entryToBeModified' : '%s/security/sasl/admin_change_SSHA.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: SASL CRAM-MD5: Postamble Step 2 - Admin Changing User Password'
</message>
@@ -353,10 +312,6 @@
'entryToBeModified' : '%s/security/sasl/admin_change_user_pwd2.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: SASL CRAM-MD5: Postamble Step 3 - User (dn:) Binding With CRAM-MD5 SASL Mechanism'
</message>
@@ -366,15 +321,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-o mech=CRAM-MD5 -o "authid=dn:uid=jrunner,ou=People,o=SASL Tests,dc=example,dc=com" -w catleg' }
+ 'extraParams' : '-o mech=CRAM-MD5 -o "authid=dn:uid=jrunner,ou=People,o=SASL Tests,dc=example,dc=com" -w catleg' ,
+ 'expectedRC' : 49 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml
index a6a73dc..e6c39b6 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml
@@ -69,10 +69,6 @@
'entryToBeModified' : '%s/security/sasl/admin_change_CLEAR.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: SASL DIGEST-MD5: Preamble Step 2 - Admin Changing User Password'
</message>
@@ -85,11 +81,6 @@
'entryToBeModified' : '%s/security/sasl/admin_change_user_pwd3.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -120,13 +111,8 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-o mech=DIGEST-MD5 -o authid=u:jsprinter -w frogleg' }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
+ 'extraParams' : '-o mech=DIGEST-MD5 -o authid=u:jsprinter -w frogleg' ,
+ 'expectedRC' : 49 }
</call>
<call function="'testCase_Postamble'"/>
@@ -162,11 +148,6 @@
'extraParams' : '-o mech=DIGEST-MD5 -o authid=u:jwalleye -w frogleg' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -200,11 +181,6 @@
'extraParams' : '-o mech=DIGEST-MD5 -o authid=u:jwalleye -w frogleg -o authzid=jwalleye' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -235,13 +211,8 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-o mech=DIGEST-MD5 -o authid=u:jwalleye -w frogleg -o authzid=jcarp' }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
+ 'extraParams' : '-o mech=DIGEST-MD5 -o authid=u:jwalleye -w frogleg -o authzid=jcarp' ,
+ 'expectedRC' : 49 }
</call>
<call function="'testCase_Postamble'"/>
@@ -274,15 +245,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-o mech=DIGEST-MD5 -o authzid=jcarp -w frogleg' }
+ 'extraParams' : '-o mech=DIGEST-MD5 -o authzid=jcarp -w frogleg' ,
+ 'expectedRC' : 89 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 89 }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -316,11 +282,6 @@
'entryToBeModified' : '%s/security/sasl/admin_change_authzid_attr.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -351,15 +312,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-o mech=DIGEST-MD5 -o authid=u:jwalleye -w frogleg -o authzid=jwalleye' }
+ 'extraParams' : '-o mech=DIGEST-MD5 -o authid=u:jwalleye -w frogleg -o authzid=jwalleye' ,
+ 'expectedRC' : 49 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -393,11 +349,6 @@
'extraParams' : '-o mech=DIGEST-MD5 -o authid=u:Walleye -w frogleg -o authzid=Walleye' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -431,11 +382,6 @@
'entryToBeModified' : '%s/security/sasl/admin_reset_authzid_attr.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -469,11 +415,6 @@
'extraParams' : '-o mech=DIGEST-MD5 -o authid=u:jwalleye -w frogleg -o authzid=jwalleye' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -509,11 +450,6 @@
'extraParams' : '-o mech=DIGEST-MD5 -o "authid=dn:uid=jsprinter,ou=People,o=SASL Tests,dc=example,dc=com" -w frogleg' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -544,15 +480,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-o mech=DIGEST-MD5 -o "authid=dn:uid=jsprinter,ou=People,o=SASL Tests,dc=example,dc=com" -w frogleg -o authzid=jsprinter' }
+ 'extraParams' : '-o mech=DIGEST-MD5 -o "authid=dn:uid=jsprinter,ou=People,o=SASL Tests,dc=example,dc=com" -w frogleg -o authzid=jsprinter' ,
+ 'expectedRC' : 49 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -586,11 +517,6 @@
'extraParams' : '-o mech=DIGEST-MD5 -o "authid=dn:uid=jwalleye,ou=People,o=SASL Realm Tests,dc=example,dc=com" -w frogleg' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -624,11 +550,6 @@
'entryToBeModified' : '%s/security/sasl/admin_add_realm.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -660,13 +581,8 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-o mech=DIGEST-MD5 -o "authid=u:jsprinter" -o "realm=o=SASL Realm Tests,dc=example,dc=com" -w frogleg' }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
+ 'extraParams' : '-o mech=DIGEST-MD5 -o "authid=u:jsprinter" -o "realm=o=SASL Realm Tests,dc=example,dc=com" -w frogleg' ,
+ 'expectedRC' : 49 }
</call>
<call function="'testCase_Postamble'"/>
@@ -703,11 +619,6 @@
'extraParams' : '-o mech=DIGEST-MD5 -o "authid=u:jwalleye" -o "realm=o=SASL Realm Tests,dc=example,dc=com" -w frogleg' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -742,11 +653,6 @@
'extraParams' : '-o mech=DIGEST-MD5 -o "authid=dn:uid=jsprinter,ou=People,o=SASL Tests,dc=example,dc=com" -o "realm=o=SASL Realm Tests,dc=example,dc=com" -w frogleg' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -781,11 +687,6 @@
'extraParams' : '-o mech=DIGEST-MD5 -o "authid=dn:uid=jwalleye,ou=People,o=SASL Realm Tests,dc=example,dc=com" -o "realm=o=SASL Realm Tests,dc=example,dc=com" -w frogleg' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -821,11 +722,6 @@
'extraParams' : '-o mech=DIGEST-MD5 -o "authid=dn:uid=jwalleye,ou=People,o=SASL Realm Tests,dc=example,dc=com" -o "realm=o=SASL Realm Tests,dc=example,dc=com -o "digest-uri=ldap:/auseng013.central.sun.com" " -w frogleg' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -858,15 +754,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-o mech=DIGEST-MD5 -o "authid=u:jsprinter" -o "realm=o=SASL Tests,dc=example,dc=com" -w frogleg' }
+ 'extraParams' : '-o mech=DIGEST-MD5 -o "authid=u:jsprinter" -o "realm=o=SASL Tests,dc=example,dc=com" -w frogleg' ,
+ 'expectedRC' : 49 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -898,13 +789,8 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-o mech=DIGEST-MD5 -o "authid=u:jwalleye" -o "realm=o=SASL Tests,dc=example,dc=com" -w frogleg' }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
+ 'extraParams' : '-o mech=DIGEST-MD5 -o "authid=u:jwalleye" -o "realm=o=SASL Tests,dc=example,dc=com" -w frogleg' ,
+ 'expectedRC' : 49 }
</call>
<call function="'testCase_Postamble'"/>
@@ -938,15 +824,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-o mech=DIGEST-MD5 -o "authid=dn:uid=jsprinter,ou=People,o=SASL Tests,dc=example,dc=com" -o "realm=o=SASL Tests,dc=example,dc=com" -w frogleg' }
+ 'extraParams' : '-o mech=DIGEST-MD5 -o "authid=dn:uid=jsprinter,ou=People,o=SASL Tests,dc=example,dc=com" -o "realm=o=SASL Tests,dc=example,dc=com" -w frogleg' ,
+ 'expectedRC' : 49 }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -978,13 +859,8 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-o mech=DIGEST-MD5 -o "authid=dn:uid=jwalleye,ou=People,o=SASL Realm Tests,dc=example,dc=com" -o "realm=o=SASL Tests,dc=example,dc=com" -w frogleg' }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
+ 'extraParams' : '-o mech=DIGEST-MD5 -o "authid=dn:uid=jwalleye,ou=People,o=SASL Realm Tests,dc=example,dc=com" -o "realm=o=SASL Tests,dc=example,dc=com" -w frogleg' ,
+ 'expectedRC' : 49 }
</call>
<call function="'testCase_Postamble'"/>
@@ -1088,10 +964,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: SASL DIGEST-MD5: User (dn:) Binding with authmethod equal sasl, sasl authentication'
</message>
@@ -1162,10 +1034,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: SASL DIGEST-MD5: User (dn:) Binding with authmethod equal sasl, sasl authentication'
</message>
@@ -1232,10 +1100,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: SASL DIGEST-MD5: User (dn:) Binding With ACI with authmethod equal sasl, put back global search ACI'
</message>
@@ -1251,11 +1115,6 @@
'changetype' : 'add' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -1357,10 +1216,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: SASL DIGEST-MD5: User (dn:) Binding with authmethod equal simple, sasl authentication'
</message>
@@ -1431,10 +1286,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: SASL DIGEST-MD5: User (dn:) Binding with authmethod equal simple, sasl authentication'
</message>
@@ -1501,10 +1352,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: SASL DIGEST-MD5: User (dn:) Binding With ACI with authmethod equal simple, put back global search ACI'
</message>
@@ -1520,11 +1367,6 @@
'changetype' : 'add' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -1626,10 +1468,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: SASL DIGEST-MD5: User (dn:) Binding with authmethod not equals simple, sasl authentication'
</message>
@@ -1700,10 +1538,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: SASL DIGEST-MD5: User (dn:) Binding with authmethod not equals simple, sasl authentication'
</message>
@@ -1770,10 +1604,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: SASL DIGEST-MD5: User (dn:) Binding With ACI with authmethod not equals simple, put back global search ACI'
</message>
@@ -1789,11 +1619,6 @@
'changetype' : 'add' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -1895,10 +1720,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: SASL DIGEST-MD5: User (dn:) Binding with authmethod equals none, sasl authentication'
</message>
@@ -1908,7 +1729,8 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-o mech=DIGEST-MD5 -o "authid=dn:uid=jwalleye,ou=People,o=SASL Realm Tests,dc=example,dc=com" -w bad' }
+ 'extraParams' : '-o mech=DIGEST-MD5 -o "authid=dn:uid=jwalleye,ou=People,o=SASL Realm Tests,dc=example,dc=com" -w bad',
+ 'expectedRC' : 49 }
</call>
<script>
@@ -1934,7 +1756,8 @@
'dsInstanceDn' : 'uid=jwalleye,ou=People,o=SASL Realm Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'bad' ,
'dsBaseDN' : 'dc=example,dc=com' ,
- 'dsFilter' : 'objectclass=*' }
+ 'dsFilter' : 'objectclass=*' ,
+ 'expectedRC' : 49 }
</call>
<script>
@@ -1969,10 +1792,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: SASL DIGEST-MD5: User (dn:) Binding with authmethod equals none, sasl authentication'
</message>
@@ -2039,10 +1858,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: SASL DIGEST-MD5: User (dn:) Binding With ACI with authmethod equals none, put back global search ACI'
</message>
@@ -2058,11 +1873,6 @@
'changetype' : 'add' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -2104,10 +1914,6 @@
'entryToBeModified' : '%s/security/sasl/admin_change_SSHA.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: SASL DIGEST-MD5: Postamble Step 2 - Admin Changing User Password'
</message>
@@ -2120,10 +1926,6 @@
'entryToBeModified' : '%s/security/sasl/admin_change_user_pwd4.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: SASL DIGEST-MD5: Postamble Step 3 - Admin Deleting Realm'
</message>
@@ -2136,10 +1938,6 @@
'entryToBeModified' : '%s/security/sasl/admin_del_realm.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: SASL DIGEST-MD5: Postamble Step 4 - User (dn:) Binding With Simple Authentication'
</message>
@@ -2154,10 +1952,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: SASL DIGEST-MD5: Postamble Step 5 - User (dn:) Binding 2'
</message>
@@ -2167,13 +1961,8 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-o mech=DIGEST-MD5 -o "authid=dn:uid=jwalleye,ou=People,o=SASL Realm Tests,dc=example,dc=com" -w catleg' }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
+ 'extraParams' : '-o mech=DIGEST-MD5 -o "authid=dn:uid=jwalleye,ou=People,o=SASL Realm Tests,dc=example,dc=com" -w catleg' ,
+ 'expectedRC' : 49 }
</call>
<call function="'testCase_Postamble'"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_plain.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_plain.xml
index 6259d0a..e9bbb60 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_plain.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_plain.xml
@@ -68,11 +68,6 @@
'entryToBeModified' : '%s/security/sasl/admin_change_user_pwd5.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -106,10 +101,6 @@
'extraParams' : '-o mech=PLAIN -o authid=u:mmiller -w mothergoose' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
@@ -144,11 +135,6 @@
'extraParams' : '-o mech=PLAIN -o authid=mmiller -w mothergoose' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -182,11 +168,6 @@
'extraParams' : '-o mech=PLAIN -o "authid=dn:uid=mmiller,ou=People,o=SASL Tests,dc=example,dc=com" -w mothergoose' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -217,13 +198,8 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-o mech=PLAIN -o authid=u:dmiller -w mothergoose' }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
+ 'extraParams' : '-o mech=PLAIN -o authid=u:dmiller -w mothergoose' ,
+ 'expectedRC' : 49 }
</call>
<call function="'testCase_Postamble'"/>
@@ -259,11 +235,6 @@
'extraParams' : '-o mech=PLAIN -o "authid=dn:uid=dmiller,ou=People,o=SASL Tests,dc=example,dc=com" -w mothergoose' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -294,13 +265,8 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-o mech=PLAIN -o "authid=uid=dmiller,ou=People,o=SASL Tests,dc=example,dc=com" -w mothergoose' }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 49 }
+ 'extraParams' : '-o mech=PLAIN -o "authid=uid=dmiller,ou=People,o=SASL Tests,dc=example,dc=com" -w mothergoose' ,
+ 'expectedRC' : 49 }
</call>
<call function="'testCase_Postamble'"/>
@@ -333,13 +299,8 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/sasl/admin_add_realm2.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 65 }
+ 'entryToBeModified' : '%s/security/sasl/admin_add_realm2.ldif' % logsRemoteDataDir ,
+ 'expectedRC' : 65 }
</call>
<call function="'testCase_Postamble'"/>
@@ -372,13 +333,8 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-o mech=PLAIN -o authid=u:mmiller -o "realm=o=SASL Realm Tests,dc=example,dc=com" -w mothergoose' }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult ,
- 'expected' : 89 }
+ 'extraParams' : '-o mech=PLAIN -o authid=u:mmiller -o "realm=o=SASL Realm Tests,dc=example,dc=com" -w mothergoose' ,
+ 'expectedRC' : 89 }
</call>
<call function="'testCase_Postamble'"/>
@@ -418,10 +374,6 @@
'entryToBeModified' : '%s/security/sasl/admin_change_user_pwd6.ldif' % logsRemoteDataDir }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: SASL PLAIN: Postamble Step 2 - User (dn:) Binding With Simple Authentication'
</message>
@@ -436,10 +388,6 @@
'extraParams' : '-s base' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'Security: SASL PLAIN: Postamble Step 3 - User (dn:) Binding With SASL PLAIN Mechanism'
</message>
@@ -452,11 +400,6 @@
'extraParams' : '-o mech=PLAIN -o "authid=dn:uid=mmiller,ou=People,o=SASL Tests,dc=example,dc=com" -w fathergoose' }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_setup_sasl.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_setup_sasl.xml
index 16307ca..305f53a 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_setup_sasl.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_setup_sasl.xml
@@ -73,11 +73,6 @@
'entryToBeAdded' : '%s/security/sasl/sasl_startup.ldif' % logsRemoteDataDir }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_teardown_sasl.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_teardown_sasl.xml
index 0583409..224a3c0 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_teardown_sasl.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_teardown_sasl.xml
@@ -70,11 +70,6 @@
'extraParams' : '-x'}
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
--
Gitblit v1.10.0