From 50f8a165bf3b68795f4f8d424286788c1abb2a13 Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Tue, 13 Mar 2007 09:18:27 +0000
Subject: [PATCH] Issue 1354 use block element for test groups and suites
---
opends/tests/functional-tests/testcases/security/security.xml | 112 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 60 insertions(+), 52 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/security/security.xml b/opends/tests/functional-tests/testcases/security/security.xml
index 6ca0cf2..fa3310f 100755
--- a/opends/tests/functional-tests/testcases/security/security.xml
+++ b/opends/tests/functional-tests/testcases/security/security.xml
@@ -31,61 +31,69 @@
<function name="main_security">
- <sequence>
+ <sequence>
+
+ <block name="'security'">
- <script>
- CurrentTestPath['group']='security'
- </script>
+ <sequence>
+
+ <script>
+ CurrentTestPath['group']='security'
+ </script>
- <call function="'testGroup_Preamble'"/>
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/jks/security_jks.xml' % (TESTS_DIR)"/>
- <call function="'security_jks'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pkcs12/security_pkcs12.xml' % (TESTS_DIR)"/>
- <call function="'security_pkcs12'" />
-<!--
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/startTLS/security_startTLS.xml' % (TESTS_DIR)"/>
- <call function="'security_startTLS'" />
--->
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/sasl/security_sasl.xml' % (TESTS_DIR)"/>
- <call function="'security_sasl'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_policy/security_pwd_policy.xml' % (TESTS_DIR)"/>
- <call function="'security_pwd_policy'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_policy_root/security_pwd_policy_root.xml' % (TESTS_DIR)"/>
- <call function="'security_pwd_policy_root'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax.xml' % (TESTS_DIR)"/>
- <call function="'security_auth_pwd_syntax'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_validator/security_pwd_validator.xml' % (TESTS_DIR)"/>
- <call function="'security_pwd_validator'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_storage/security_pwd_storage.xml' % (TESTS_DIR)"/>
- <call function="'security_pwd_storage'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/bind_no_pwd/security_bind_no_pwd.xml' % (TESTS_DIR)"/>
- <call function="'security_bind_no_pwd'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/account_activation/security_account_activation.xml' % (TESTS_DIR)"/>
- <call function="'security_account_activation'" />
-
- <call function="'testGroup_Postamble'"/>
+ <call function="'testGroup_Preamble'"/>
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/jks/security_jks.xml' % (TESTS_DIR)"/>
+ <call function="'security_jks'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pkcs12/security_pkcs12.xml' % (TESTS_DIR)"/>
+ <call function="'security_pkcs12'" />
+ <!--
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/startTLS/security_startTLS.xml' % (TESTS_DIR)"/>
+ <call function="'security_startTLS'" />
+ -->
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/sasl/security_sasl.xml' % (TESTS_DIR)"/>
+ <call function="'security_sasl'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_policy/security_pwd_policy.xml' % (TESTS_DIR)"/>
+ <call function="'security_pwd_policy'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_policy_root/security_pwd_policy_root.xml' % (TESTS_DIR)"/>
+ <call function="'security_pwd_policy_root'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax.xml' % (TESTS_DIR)"/>
+ <call function="'security_auth_pwd_syntax'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_validator/security_pwd_validator.xml' % (TESTS_DIR)"/>
+ <call function="'security_pwd_validator'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_storage/security_pwd_storage.xml' % (TESTS_DIR)"/>
+ <call function="'security_pwd_storage'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/bind_no_pwd/security_bind_no_pwd.xml' % (TESTS_DIR)"/>
+ <call function="'security_bind_no_pwd'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/account_activation/security_account_activation.xml' % (TESTS_DIR)"/>
+ <call function="'security_account_activation'" />
+
+ <call function="'testGroup_Postamble'"/>
- </sequence>
+ </sequence>
+
+ </block>
+
+ </sequence>
</function>
--
Gitblit v1.10.0