From 67405dde9ba213331dab1fc46cb18c485070fd5b Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 05 Jun 2009 09:04:50 +0000
Subject: [PATCH] svn merge -r5333:5417 https://opends.dev.java.net/svn/opends/branches/b2.0
---
opends/tests/staf-tests/functional-tests/testcases/dsml/dsml.xml | 90 ++++++++++++++++++++++++++++++--------------
1 files changed, 61 insertions(+), 29 deletions(-)
diff --git a/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml.xml b/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml.xml
index c2ae885..c096616 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml.xml
@@ -23,43 +23,75 @@
!
! CDDL HEADER END
!
- ! Portions Copyright 2008 Sun Microsystems, Inc.
+ ! Portions Copyright 2008-2009 Sun Microsystems, Inc.
! -->
<stax>
- <defaultcall function="main_dsml" />
+ <defaultcall function="main_dsml" />
<function name="main_dsml">
<function-list-args>
<function-required-arg name="STAXParentID"/>
</function-list-args>
- <block name="'dsml'">
- <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']='dsml'
- </script>
- <call function="'testGroup_Preamble'" />
- <script>
- testList = []
- testList.append(['.','dsml_setup'])
- testList.append(['.','dsml_test'])
- testList.append(['.','dsml_cleanup'])
- </script>
- <iterate var="_test" in="testList">
+ <sequence>
+ <try>
+ <block name="'dsml'">
<sequence>
+ <!--- Load the job environment for the test group execution -->
<import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/dsml/%s/%s.xml' %
- (TESTS_DIR,_test[0],_test[1])"/>
- <call function="'%s' % _test[1]" />
+ file="'%s/environment.xml' % TESTS_FUNCTIONS_DIR" />
+ <call function="'loadJobEnvironment'">
+ { 'parent' : STAXParentID }
+ </call>
+ <script>
+ CurrentTestPath['group']='dsml'
+ _group=CurrentTestPath['group']
+ </script>
+ <call function="'testGroup_Preamble'" />
+ <script>
+ suiteList = []
+ suiteList.append('dsml_test')
+ </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>
- </iterate>
- <call function="'testGroup_Postamble'" />
- </sequence>
- </block>
+ </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