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_cleanup.xml | 82 +++++++++++++++++------------------------
1 files changed, 34 insertions(+), 48 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/logging/logging_cleanup.xml b/opends/tests/functional-tests/testcases/logging/logging_cleanup.xml
index 74584b2..bc8dfe4 100755
--- a/opends/tests/functional-tests/testcases/logging/logging_cleanup.xml
+++ b/opends/tests/functional-tests/testcases/logging/logging_cleanup.xml
@@ -26,69 +26,55 @@
! Portions Copyright 2007 Sun Microsystems, Inc.
! -->
<stax>
-
<defaultcall function="logging_cleanup"/>
-
<function name="logging_cleanup">
-
<sequence>
-
<block name="'cleanup'">
-
<sequence>
-
-
- <block name="'Block DS Process Stop'">
+ <block name="'Block DS Process Stop'">
<!--- Stop DS -->
- <sequence>
+ <sequence>
<message>
- 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
+ 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
</message>
-
+
<call function="'StopDsWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsHost' : DIRECTORY_INSTANCE_HOST,
'dsPort' : DIRECTORY_INSTANCE_PORT,
'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD
+ }
</call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- </sequence>
- <!--- End Block DS Process Stop -->
- </block>
-
-
-
- <block name="'Block Remove DS Topology'">
- <!-- Remove the topology created for the test suite -->
- <sequence>
-
- <message>
- 'Remove DS topology created for the Test Suite'
- </message>
-
- <call function="'removeTopology'"/>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- </sequence>
- <!-- End Block Remove DS Topology-->
- </block>
-
- </sequence>
- </block>
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult
+ }
+ </call>
+ </sequence>
+ <!--- End Block DS Process Stop -->
+ </block>
+ <block name="'Block Remove DS Topology'">
+ <!-- Remove the topology created for the test suite -->
+ <sequence>
+ <message>
+ 'Remove DS topology created for the Test Suite'
+ </message>
+
+ <call function="'removeTopology'" />
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult
+ }
+ </call>
- </sequence>
-
+ </sequence>
+ <!-- End Block Remove DS Topology-->
+ </block>
+ </sequence>
+ </block>
+ </sequence>
</function>
-
</stax>
--
Gitblit v1.10.0