From b3ba51e8d1f4ac88411f716f20d3671c195ea759 Mon Sep 17 00:00:00 2001
From: al_xipe <al_xipe@localhost>
Date: Sat, 25 Aug 2007 12:21:54 +0000
Subject: [PATCH] massive retrofit of the logging tests into the framework
---
opends/tests/functional-tests/testcases/logging/logging.xml | 56 +++++++++++++-------------------------------------------
1 files changed, 13 insertions(+), 43 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/logging/logging.xml b/opends/tests/functional-tests/testcases/logging/logging.xml
index 5ad5a5d..f160f83 100755
--- a/opends/tests/functional-tests/testcases/logging/logging.xml
+++ b/opends/tests/functional-tests/testcases/logging/logging.xml
@@ -26,56 +26,26 @@
! Portions Copyright 2006-2007 Sun Microsystems, Inc.
! -->
<stax>
-
<defaultcall function="main_logging"/>
-
<function name="main_logging">
-
<sequence>
-
<block name="'logging'">
-
<sequence>
-
- <script>
- CurrentTestPath['group']='logging'
- CurrentTestPath['suite']=STAXCurrentBlock
- </script>
-
- <call function="'testSuite_Preamble'"/>
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/logging/logging_setup.xml' % (TESTS_DIR)"/>
- <call function="'logging_setup'"/>
-
- <import machine="'%s' % STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/logging/logging_rotation.xml' % (TESTS_DIR)"/>
- <call function="'logging_rotation'" />
-
- <import machine="'%s' % STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/logging/logging_properties.xml' % (TESTS_DIR)"/>
- <call function="'logging_properties'" />
-
- <import machine="'%s' % STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/logging/logging_writer.xml' % (TESTS_DIR)"/>
- <call function="'logging_writer'" />
-
- <import machine="'%s' % STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/logging/logging_retention.xml' % (TESTS_DIR)"/>
- <call function="'logging_retention'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/logging/logging_cleanup.xml' % (TESTS_DIR)"/>
- <call function="'logging_cleanup'"/>
-
- <call function="'testSuite_Postamble'"/>
-
+ <script>
+ CurrentTestPath['group']=STAXCurrentBlock
+ </script>
+
+ <call function="'testGroup_Preamble'" />
+ <iterate var="_test" in="['setup','rotation','properties','writer','retention','cleanup']" >
+ <sequence>
+ <import machine="STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/logging/logging_%s.xml' % (TESTS_DIR,_test)"/>
+ <call function="'logging_%s' % _test" />
+ </sequence>
+ </iterate>
+ <call function="'testGroup_Postamble'" />
</sequence>
-
</block>
-
</sequence>
-
</function>
-
</stax>
--
Gitblit v1.10.0