From 4da6e70f325b5660a3c0aa813a47cc80f50e95df Mon Sep 17 00:00:00 2001
From: el_kaboing <el_kaboing@localhost>
Date: Mon, 18 Dec 2006 22:18:24 +0000
Subject: [PATCH] Combined two sets of consecutive multiple searches into two sets of iterative searches in order to tighten the code.
---
opends/tests/functional-tests/testcases/security/pwd_policy/security_mult_pwd_policies.xml | 108 +++++++++++++++---------------------------------------
1 files changed, 30 insertions(+), 78 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/security/pwd_policy/security_mult_pwd_policies.xml b/opends/tests/functional-tests/testcases/security/pwd_policy/security_mult_pwd_policies.xml
index 7a12a88..5ba871f 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_policy/security_mult_pwd_policies.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_policy/security_mult_pwd_policies.xml
@@ -138,45 +138,21 @@
'Security: Mult Pwd Policies: Testing Sales Pwd Policy with Lockout Count'
</message>
- <call function="'SearchObject'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=sguy,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'bad' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
- 'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
- </call>
-
- <call function="'SearchObject'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=sguy,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'bad' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
- 'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
- </call>
-
- <call function="'SearchObject'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=sguy,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'bad' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
- 'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
- </call>
-
- <call function="'SearchObject'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=sguy,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'superguy' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
- 'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
- </call>
+ <script>
+ search_pwds = ['bad', 'bad', 'bad', 'superguy']
+ </script>
+
+ <iterate var="pwds" in="search_pwds" indexvar="index">
+ <call function="'SearchObject'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=sguy,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : '%s' % pwds ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'extraParams' : '-s base' }
+ </call>
+ </iterate>
<call function="'checktestRC'">
{ 'returncode' : RC ,
@@ -194,45 +170,21 @@
'Security: Mult Pwd Policies: Testing Default Pwd Policy with Lockout Count'
</message>
- <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' : 'bad' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
- 'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
- </call>
-
- <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' : 'bad' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
- 'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
- </call>
-
- <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' : 'bad' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
- 'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
- </call>
-
- <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' : 'cardreader' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
- 'dsFilter' : 'objectclass=*' ,
- 'extraParams' : '-s base' }
- </call>
+ <script>
+ search_pwds = ['bad', 'bad', 'bad', 'cardreader']
+ </script>
+
+ <iterate var="pwds" in="search_pwds" indexvar="index">
+ <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' : '%s' % pwds ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'extraParams' : '-s base' }
+ </call>
+ </iterate>
<call function="'checktestRC'">
{ 'returncode' : RC ,
--
Gitblit v1.10.0