From 4e7101fd2097719f302d0948d855f23fff6059f8 Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Mon, 26 Oct 2009 15:18:37 +0000
Subject: [PATCH] Frontport of 2.2 tests to the trunk
---
opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig.xml | 55 ++++++++++++++++++++++++++++---------------------------
1 files changed, 28 insertions(+), 27 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 f8314a4..12bfcd2 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig.xml
@@ -51,35 +51,36 @@
suiteList = []
suiteList.append('dsconfig_list')
suiteList.append('dsconfig_get')
+ suiteList.append('dsconfig_batch-mode')
</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>
+ <!-- Run the test suites -->
+ <iterate var="_suite" in="suiteList">
+ <sequence>
+ <try>
+ <sequence>
+ <import machine="STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/%s/%s/%s.xml' % (TESTS_DIR,_group,_suite,_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>
--
Gitblit v1.10.0