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/backends/backends.xml | 65 ++++++++++++++++++++++++--------
1 files changed, 49 insertions(+), 16 deletions(-)
diff --git a/opends/tests/staf-tests/functional-tests/testcases/backends/backends.xml b/opends/tests/staf-tests/functional-tests/testcases/backends/backends.xml
index f379858..5fa3a26 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/backends/backends.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/backends/backends.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2006-2008 Sun Microsystems, Inc.
+ ! Copyright 2006-2009 Sun Microsystems, Inc.
! -->
<stax>
<defaultcall function="main_backends"/>
@@ -32,6 +32,8 @@
<function-required-arg name="STAXParentID"/>
</function-list-args>
<sequence>
+
+ <try>
<block name="'backends'">
<sequence>
@@ -49,27 +51,58 @@
<!-- List of backends test suites to run -->
<script>
- testList = []
- testList.append('import')
- testList.append('import-tasks')
- testList.append('backup')
- testList.append('backup-tasks')
- testList.append('restore')
- testList.append('restore-tasks')
- testList.append('export')
- testList.append('export-tasks')
+ suiteList = []
+ suiteList.append('import')
+ suiteList.append('import-tasks')
+ suiteList.append('backup')
+ suiteList.append('backup-tasks')
+ suiteList.append('restore')
+ suiteList.append('restore-tasks')
+ suiteList.append('export')
+ suiteList.append('export-tasks')
</script>
-
- <iterate var="_test" in="testList" >
+
+ <!-- Run the test suites -->
+ <iterate var="_suite" in="suiteList">
<sequence>
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/backends/%s.xml' % (TESTS_DIR,_test)"/>
- <call function="'main_%s' % _test" />
+ <try>
+ <sequence>
+ <import machine="STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/backends/%s.xml' % (TESTS_DIR,_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>
- <call function="'testGroup_Postamble'"/>
+
</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>
--
Gitblit v1.10.0