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/backup-tasks.xml | 80 +++++++++++++--------------------------
1 files changed, 27 insertions(+), 53 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/backends/backup-tasks.xml b/opends/tests/functional-tests/testcases/backends/backup-tasks.xml
index f590bb7..2a1ebe9 100755
--- a/opends/tests/functional-tests/testcases/backends/backup-tasks.xml
+++ b/opends/tests/functional-tests/testcases/backends/backup-tasks.xml
@@ -25,78 +25,52 @@
!
! Portions Copyright 2007 Sun Microsystems, Inc.
! -->
-
<stax>
-
<defaultcall function="main_backup-tasks"/>
-
<function name="main_backup-tasks">
-
<sequence>
-
<block name="'backup-tasks'">
-
<sequence>
-
<script>
if not CurrentTestPath.has_key('group'):
- CurrentTestPath['group']='backends'
+ CurrentTestPath['group']='backends'
CurrentTestPath['suite']=STAXCurrentBlock
</script>
+ <call function="'testSuite_Preamble'" />
- <call function="'testSuite_Preamble'"/>
-
-
<import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/backends/backend_setup.xml' % (TESTS_DIR)"/>
+ file="'%s/testcases/backends/backend_setup.xml' % (TESTS_DIR)" />
<call function="'backend_setup'"> { 'loadBackend' : True } </call>
-
-
-
- <testcase name="'Backend: Backup Tasks 1'">
-
- <sequence>
+ <testcase name="'Backend: Backup Tasks: Test 1'">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Backend ExportTasks1: Backup the data in OpenDS by scheduling a task'
+ </message>
+ <call function="'backupTask'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'taskID' : '3',
+ 'backupDir' : '%s/backends/' % logsRemoteDataDir
+ }
+ </call>
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult
+ }
+ </call>
+ <call function="'testCase_Postamble'" />
+ </sequence>
+ </testcase>
- <call function="'testCase_Preamble'"/>
- <message>
- 'Backend ExportTasks1: Backup the data in OpenDS by scheduling a task'
- </message>
- <call function="'backupTask'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'taskID' : '3',
- 'backupDir' : '%s/backends/' % logsRemoteDataDir
- }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- <call function="'testCase_Postamble'"/>
-
- </sequence>
-
- </testcase>
-
-
-
<import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/backends/backend_cleanup.xml' % (TESTS_DIR)"/>
+ file="'%s/testcases/backends/backend_cleanup.xml' % (TESTS_DIR)"/>
<call function="'backend_cleanup'"/>
-
-
<call function="'testSuite_Postamble'"/>
-
</sequence>
-
</block>
-
</sequence>
-
</function>
-
</stax>
--
Gitblit v1.10.0