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/backends/backends.xml | 98 ++++++++++++++++++++++++++----------------------
1 files changed, 53 insertions(+), 45 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/backends/backends.xml b/opends/tests/functional-tests/testcases/backends/backends.xml
index 4f5a04b..5039627 100644
--- a/opends/tests/functional-tests/testcases/backends/backends.xml
+++ b/opends/tests/functional-tests/testcases/backends/backends.xml
@@ -31,56 +31,64 @@
<function name="main_backends">
- <sequence>
+ <sequence>
- <script>
- CurrentTestPath['group']='backends'
- </script>
+ <block name="'backends'">
- <call function="'testGroup_Preamble'"/>
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/backends/import.xml' % (TESTS_DIR)"/>
- <call function="'main_import'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/backends/import-tasks.xml' % (TESTS_DIR)"/>
- <call function="'main_import-tasks'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/backends/backendsetup.xml' % (TESTS_DIR)"/>
- <call function="'main_backend-setup'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/backends/backup-tasks.xml' % (TESTS_DIR)"/>
- <call function="'main_backup-tasks'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/backends/backup.xml' % (TESTS_DIR)"/>
- <call function="'main_backup'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/backends/restore-tasks.xml' % (TESTS_DIR)"/>
- <call function="'main_restore-tasks'" />
+ <sequence>
+
+ <script>
+ CurrentTestPath['group']='backends'
+ </script>
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/backends/restore.xml' % (TESTS_DIR)"/>
- <call function="'main_restore'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/backends/export-tasks.xml' % (TESTS_DIR)"/>
- <call function="'main_export-tasks'" />
+ <call function="'testGroup_Preamble'"/>
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/backends/import.xml' % (TESTS_DIR)"/>
+ <call function="'main_import'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/backends/import-tasks.xml' % (TESTS_DIR)"/>
+ <call function="'main_import-tasks'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/backends/backendsetup.xml' % (TESTS_DIR)"/>
+ <call function="'main_backend-setup'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/backends/backup-tasks.xml' % (TESTS_DIR)"/>
+ <call function="'main_backup-tasks'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/backends/backup.xml' % (TESTS_DIR)"/>
+ <call function="'main_backup'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/backends/restore-tasks.xml' % (TESTS_DIR)"/>
+ <call function="'main_restore-tasks'" />
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/backends/export.xml' % (TESTS_DIR)"/>
- <call function="'main_export'" />
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/backends/restore.xml' % (TESTS_DIR)"/>
+ <call function="'main_restore'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/backends/export-tasks.xml' % (TESTS_DIR)"/>
+ <call function="'main_export-tasks'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/backends/export.xml' % (TESTS_DIR)"/>
+ <call function="'main_export'" />
+
+ <!-- Set the server backup the way it was before the backend tests -->
+ <call function="'main_quickstart'" />
+
+ <call function="'testGroup_Postamble'"/>
- <!-- Set the server backup the way it was before the backend tests -->
- <call function="'main_quickstart'" />
-
- <call function="'testGroup_Postamble'"/>
-
- </sequence>
+ </sequence>
+
+ </block>
+
+ </sequence>
</function>
--
Gitblit v1.10.0