From ccb383c5308f88916e6946ef9479cedef8d98481 Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Tue, 04 Aug 2009 10:14:21 +0000
Subject: [PATCH] refactoring to use different backend types
---
opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig.xml | 98 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 64 insertions(+), 34 deletions(-)
diff --git a/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig.xml b/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig.xml
index eff9d3b..f8314a4 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig.xml
@@ -23,46 +23,76 @@
!
! CDDL HEADER END
!
- ! Copyright 2007-2008 Sun Microsystems, Inc.
+ ! Copyright 2007-2009 Sun Microsystems, Inc.
! -->
<stax>
-
- <defaultcall function="main_dsconfig"/>
-
+ <defaultcall function="main_dsconfig" />
<function name="main_dsconfig">
<function-list-args>
<function-required-arg name="STAXParentID"/>
</function-list-args>
+
<sequence>
-
- <block name="'dsconfig'">
-
- <sequence>
- <!--- Load the job environment for the test group execution -->
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/environment.xml' % TESTS_FUNCTIONS_DIR" />
- <call function="'loadJobEnvironment'">
- { 'parent' : STAXParentID }
- </call>
-
- <script>
- CurrentTestPath['group']='dsconfig'
- </script>
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/dsconfig/dsconfig_list.xml' % (TESTS_DIR)"/>
- <call function="'dsconfig_list'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/dsconfig/dsconfig_get.xml' % (TESTS_DIR)"/>
- <call function="'dsconfig_get'" />
-
- </sequence>
-
- </block>
-
+ <try>
+ <block name="'dsconfig'">
+ <sequence>
+ <!--- Load the job environment for the test group execution -->
+ <import machine="STAF_LOCAL_HOSTNAME"
+ file="'%s/environment.xml' % TESTS_FUNCTIONS_DIR" />
+ <call function="'loadJobEnvironment'">
+ { 'parent' : STAXParentID }
+ </call>
+ <script>
+ CurrentTestPath['group']='dsconfig'
+ _group=CurrentTestPath['group']
+ </script>
+ <call function="'testGroup_Preamble'" />
+ <script>
+ suiteList = []
+ suiteList.append('dsconfig_list')
+ suiteList.append('dsconfig_get')
+ </script>
+
+ <!-- Run the test suites -->
+ <iterate var="_suite" in="suiteList">
+ <sequence>
+ <try>
+ <sequence>
+ <import machine="STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/%s/%s.xml' % (TESTS_DIR,_group,_suite)"/>
+ <call function="'%s' % _suite" />
+ </sequence>
+ <catch exception="'STAFException.TestSuite.SetupException'">
+ <sequence>
+ <message log="1" level="'fatal'">'Setup of test suite %s failed.' % _suite</message>
+ </sequence>
+ </catch>
+ <catch exception="'STAFException.TestSuite.MainException'">
+ <sequence>
+ <message log="1" level="'fatal'">'Main part of test suite %s failed.' % _suite</message>
+ </sequence>
+ </catch>
+ <catch exception="'STAFException.TestSuite.CleanupException'">
+ <sequence>
+ <message log="1" level="'fatal'">'Cleanup of test suite %s failed.' % _suite</message>
+ </sequence>
+ </catch>
+ </try>
+ </sequence>
+ </iterate>
+
+ </sequence>
+ </block>
+ <catch exception="'STAXException.TestGroupException'">
+ <sequence>
+ <message log="1" level="'fatal'">'Execution of Test Group Failed'</message>
+ </sequence>
+ </catch>
+ <finally>
+ <!-- Test Group postamble -->
+ <call function="'testGroup_Postamble'"/>
+ </finally>
+ </try>
</sequence>
-
</function>
-
-</stax>
+</stax>
\ No newline at end of file
--
Gitblit v1.10.0