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/virtualAttributes/virtualAttributes.xml | 91 ++++++++++++++++++++++++++++++++-------------
1 files changed, 64 insertions(+), 27 deletions(-)
diff --git a/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes.xml b/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes.xml
index 6241d28..6fc0e9d 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2007-2008 Sun Microsystems, Inc.
+ ! Copyright 2007-2009 Sun Microsystems, Inc.
! -->
<stax>
@@ -35,37 +35,74 @@
</function-list-args>
<sequence>
-
- <block name="'virtualAttributes'">
-
- <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']='virtualAttributes'
- </script>
+ <try>
- <call function="'testGroup_Preamble'"/>
+ <block name="'virtualAttributes'">
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/virtualAttributes/virtualAttributes_cos.xml'
- % (TESTS_DIR)"/>
- <call function="'main_virtualAttributes_cos'" />
+ <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']='virtualAttributes'
+ _group=CurrentTestPath['group']
+ </script>
+
+ <call function="'testGroup_Preamble'"/>
+
+ <!-- List of ACI test suites to run -->
+ <script>
+ suiteList=[]
+ suiteList.append('virtualAttributes_cos')
+ </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="'main_%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'"/>
-
- </sequence>
-
- </block>
-
+ </finally>
+ </try>
+
</sequence>
-
</function>
-
</stax>
--
Gitblit v1.10.0