From 3d298aaf5f040a720b1c32fe5c87a292a0950e20 Mon Sep 17 00:00:00 2001
From: al_xipe <al_xipe@localhost>
Date: Wed, 15 Aug 2007 03:47:14 +0000
Subject: [PATCH] more fixes and refactoring for the backends suite. Some additional error checking in runCommand and some clean up in dsconfig.xml
---
opends/tests/functional-tests/testcases/backends/backends.xml | 54 +++++++-----------------------------------------------
1 files changed, 7 insertions(+), 47 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/backends/backends.xml b/opends/tests/functional-tests/testcases/backends/backends.xml
index a092244..1b9c3e9 100644
--- a/opends/tests/functional-tests/testcases/backends/backends.xml
+++ b/opends/tests/functional-tests/testcases/backends/backends.xml
@@ -26,65 +26,25 @@
! Portions Copyright 2006-2007 Sun Microsystems, Inc.
! -->
<stax>
-
<defaultcall function="main_backends"/>
-
<function name="main_backends">
-
<sequence>
-
<block name="'backends'">
-
<sequence>
-
<script>
CurrentTestPath['group']='backends'
</script>
-
<call function="'testGroup_Preamble'"/>
-
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/backends/import.xml' % (TESTS_DIR)"/>
- <call function="'main_import'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/backends/import-tasks.xml' % (TESTS_DIR)"/>
- <call function="'main_import-tasks'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/backends/backup-tasks.xml' % (TESTS_DIR)"/>
- <call function="'main_backup-tasks'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/backends/backup.xml' % (TESTS_DIR)"/>
- <call function="'main_backup'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/backends/restore-tasks.xml' % (TESTS_DIR)"/>
- <call function="'main_restore-tasks'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/backends/restore.xml' % (TESTS_DIR)"/>
- <call function="'main_restore'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/backends/export-tasks.xml' % (TESTS_DIR)"/>
- <call function="'main_export-tasks'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/backends/export.xml' % (TESTS_DIR)"/>
- <call function="'main_export'" />
-
-
+ <iterate var="_test" in="['import','import-tasks','backup-tasks','backup','restore-tasks','restore','export-tasks','export']" >
+ <sequence>
+ <import machine="STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/backends/%s.xml' % (TESTS_DIR,_test)"/>
+ <call function="'main_%s' % _test" />
+ </sequence>
+ </iterate>
<call function="'testGroup_Postamble'"/>
-
</sequence>
-
</block>
-
</sequence>
-
</function>
-
</stax>
--
Gitblit v1.10.0