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_setup.xml | 82 +++++++++++++++++------------------------
1 files changed, 34 insertions(+), 48 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/logging/logging_setup.xml b/opends/tests/functional-tests/testcases/logging/logging_setup.xml
index e19cbc3..55da17a 100755
--- a/opends/tests/functional-tests/testcases/logging/logging_setup.xml
+++ b/opends/tests/functional-tests/testcases/logging/logging_setup.xml
@@ -26,74 +26,60 @@
! Portions Copyright 2007 Sun Microsystems, Inc.
! -->
<stax>
-
<defaultcall function="logging_setup"/>
-
<function name="logging_setup">
-
<sequence>
-
<block name="'setup'">
-
<sequence>
-
-
- <block name="'Block Create DS Topology'">
- <!-- Create the topology necessary to the test group/suite -->
- <sequence>
-
+ <block name="'Block Create DS Topology'">
+ <!-- Create the topology necessary to the test group/suite -->
+ <sequence>
<message>
- 'Create DS topology as described in config.py'
+ 'Create DS topology as described in config.py'
</message>
-
- <call function="'createTopology'">
- { 'initialiseInstance' : True }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
+
+ <call function="'createTopology'">
+ { 'initialiseInstance' : True }
</call>
-
- </sequence>
- <!--- End Block Create DS Topology -->
- </block>
-
-
- <block name="'Block DS Process Active'">
- <!--- Start DS -->
- <sequence>
-
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult
+ }
+ </call>
+ </sequence>
+ <!--- End Block Create DS Topology -->
+ </block>
+
+ <block name="'Block DS Process Active'">
+ <!--- Start DS -->
+ <sequence>
<message>
- 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
+ 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
</message>
-
+
<!--- Start DS -->
<call function="'StartDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME }
+ { 'location' : STAF_REMOTE_HOSTNAME }
</call>
-
+
<call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
+ { 'returncode' : RC ,
+ 'result' : STAXResult
+ }
</call>
-
+
<!--- Check that DS started -->
<call function="'isAlive'">
{ 'noOfLoops' : 5 ,
- 'noOfMilliSeconds' : 2000 }
- </call>
-
+ 'noOfMilliSeconds' : 2000
+ }
+ </call>
</sequence>
- <!--- End Block DS Process Active -->
- </block>
-
-
- </sequence>
+ <!--- End Block DS Process Active -->
+ </block>
+ </sequence>
</block>
-
</sequence>
-
</function>
-
</stax>
--
Gitblit v1.10.0