From 101a07c8ae0506d3231cd0f9874219dedb745ee7 Mon Sep 17 00:00:00 2001
From: mkeyes <mkeyes@localhost>
Date: Wed, 26 Sep 2007 19:22:31 +0000
Subject: [PATCH] Updated some of the security functional tests to reflect recent upgrades in the OpenDS source code.
---
opends/tests/functional-tests/testcases/security/pwd_policy/security_preencoded_pwds.xml | 2 +-
opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_storage.xml | 4 ++--
opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml | 9 ---------
3 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/security/pwd_policy/security_preencoded_pwds.xml b/opends/tests/functional-tests/testcases/security/pwd_policy/security_preencoded_pwds.xml
index f7bcb7c..009f17f 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_policy/security_preencoded_pwds.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_policy/security_preencoded_pwds.xml
@@ -69,7 +69,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'entryToBeAdded' : '%s/security/pwd_policy/add_entry_preencoded_pwd.ldif' % logsRemoteDataDir ,
- 'expectedRC' : 19 }
+ 'expectedRC' : 53 }
</call>
<call function="'SearchObject'">
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml
index 71fb89c..02ce819 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml
@@ -228,15 +228,6 @@
'expectedRC' : 1 }
</call>
- <script>
- returnString = STAXReason[0][1]
- </script>
-
- <call function="'checktestString'">
- { 'returnString' : returnString ,
- 'expectedString' : 'error code 53' }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_storage.xml b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_storage.xml
index 3b16d8b..05d2f0c 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_storage.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_storage.xml
@@ -94,11 +94,11 @@
<import machine="STAF_LOCAL_HOSTNAME"
file="'%s/testcases/security/pwd_storage/security_pwd_CRYPT.xml' % (TESTS_DIR)"/>
<call function="'pwd_CRYPT'" />
-
+ <!--
<import machine="STAF_LOCAL_HOSTNAME"
file="'%s/testcases/security/pwd_storage/security_multiple_schemes.xml' % (TESTS_DIR)"/>
<call function="'multiple_schemes'" />
-
+ -->
<import machine="STAF_LOCAL_HOSTNAME"
file="'%s/testcases/security/pwd_storage/security_deprecated_schemes.xml' % (TESTS_DIR)"/>
<call function="'deprecated_schemes'" />
--
Gitblit v1.10.0