From 50f8a165bf3b68795f4f8d424286788c1abb2a13 Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Tue, 13 Mar 2007 09:18:27 +0000
Subject: [PATCH] Issue 1354 use block element for test groups and suites
---
opends/tests/functional-tests/testcases/cleanup/cleanup.xml | 46 +++++++++++++++++++++++++++-------------------
1 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/cleanup/cleanup.xml b/opends/tests/functional-tests/testcases/cleanup/cleanup.xml
index 18325fe..1aa1cbf 100755
--- a/opends/tests/functional-tests/testcases/cleanup/cleanup.xml
+++ b/opends/tests/functional-tests/testcases/cleanup/cleanup.xml
@@ -31,27 +31,35 @@
<function name="main_cleanup">
- <sequence>
+ <sequence>
- <!--- Delete file if it exists already-->
- <message>
- 'Delete folder %s/ldifdata.zip' % DIRECTORY_INSTANCE_DIR
- </message>
- <call function="'deleteFile'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'filename' : '%s/ldifdata.zip' % DIRECTORY_INSTANCE_DIR }
- </call>
+ <block name="'cleanup'">
+
+ <sequence>
- <!--- Delete folder if it exists already-->
- <message>
- 'Delete folder %s/functional-tests' % DIRECTORY_INSTANCE_DIR
- </message>
- <call function="'deleteFolder'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'foldername' : '%s/functional-tests' % DIRECTORY_INSTANCE_DIR }
- </call>
-
- </sequence>
+ <!--- Delete file if it exists already-->
+ <message>
+ 'Delete folder %s/ldifdata.zip' % DIRECTORY_INSTANCE_DIR
+ </message>
+ <call function="'deleteFile'">
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'filename' : '%s/ldifdata.zip' % DIRECTORY_INSTANCE_DIR }
+ </call>
+
+ <!--- Delete folder if it exists already-->
+ <message>
+ 'Delete folder %s/functional-tests' % DIRECTORY_INSTANCE_DIR
+ </message>
+ <call function="'deleteFolder'">
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'foldername' : '%s/functional-tests' % DIRECTORY_INSTANCE_DIR }
+ </call>
+
+ </sequence>
+
+ </block>
+
+ </sequence>
</function>
--
Gitblit v1.10.0