From b276edf04ff87f8f58b6424e0fb9e9d891d01b7e Mon Sep 17 00:00:00 2001
From: smaguin <smaguin@localhost>
Date: Fri, 07 Dec 2007 15:41:58 +0000
Subject: [PATCH] fix identation pb
---
opends/tests/functional-tests/testcases/tasks/export-ldif.xml | 251 ++++++------
opends/tests/functional-tests/testcases/tasks/tasks.xml | 10
opends/tests/functional-tests/testcases/tasks/cleanup.xml | 32
opends/tests/functional-tests/testcases/tasks/import-ldif.xml | 316 ++++++++--------
opends/tests/functional-tests/testcases/tasks/restart_db.xml | 170 ++++----
opends/tests/functional-tests/testcases/tasks/backup_db.xml | 37 -
opends/tests/functional-tests/testcases/tasks/restore_db.xml | 172 ++++----
opends/tests/functional-tests/testcases/tasks/setup.xml | 104 ++--
8 files changed, 543 insertions(+), 549 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/tasks/backup_db.xml b/opends/tests/functional-tests/testcases/tasks/backup_db.xml
index 7bde1b5..033e34e 100644
--- a/opends/tests/functional-tests/testcases/tasks/backup_db.xml
+++ b/opends/tests/functional-tests/testcases/tasks/backup_db.xml
@@ -76,23 +76,23 @@
</call>
<message>'--- Check log files backup_asynchronous ---'</message>
- <call function="'listFolder'">
- { 'location' : '%s' % (STAF_REMOTE_HOSTNAME),
- 'foldername' : '%s/tasks' % logsRemoteDataDir,
- 'filename' : 'backup_asynchronous'
- }
+ <call function="'listFolder'">
+ { 'location' : '%s' % (STAF_REMOTE_HOSTNAME),
+ 'foldername' : '%s/tasks' % logsRemoteDataDir,
+ 'filename' : 'backup_asynchronous'
+ }
</call>
<!-- check the export ldif file has been created-->
- <if expr="len(cmdResult) == 0">
+ <if expr="len(cmdResult) == 0">
<call function="'testFailed'"/>
<else>
<call function="'testPassed'"/>
</else>
</if>
- <call function="'testCase_Postamble'"/>
- </sequence>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
</testcase>
@@ -110,7 +110,6 @@
<testcase name="getTestCaseName('schedule backup task for immediate execution in synchronous mode')">
<sequence>
<call function="'testCase_Preamble'"/>
-
<call function="'backup'">
{ 'location' : STAF_REMOTE_HOSTNAME ,
@@ -123,22 +122,22 @@
</call>
<message>'--- Check log files ---'</message>
- <call function="'listFolder'">
- { 'location' : '%s' % (STAF_REMOTE_HOSTNAME),
- 'foldername' : '%s/tasks' % logsRemoteDataDir,
- 'filename' : 'backup_synchronous'
- }
+ <call function="'listFolder'">
+ { 'location' : '%s' % (STAF_REMOTE_HOSTNAME),
+ 'foldername' : '%s/tasks' % logsRemoteDataDir,
+ 'filename' : 'backup_synchronous'
+ }
</call>
- <!-- check the export ldif file has been created-->
- <if expr="len(cmdResult) == 0">
+ <!-- check the export ldif file has been created-->
+ <if expr="len(cmdResult) == 0">
<call function="'testFailed'"/>
<else>
<call function="'testPassed'"/>
</else>
</if>
-
- <call function="'testCase_Postamble'"/>
- </sequence>
+
+ <call function="'testCase_Postamble'"/>
+ </sequence>
</testcase>
diff --git a/opends/tests/functional-tests/testcases/tasks/cleanup.xml b/opends/tests/functional-tests/testcases/tasks/cleanup.xml
index 2255bde..1957e02 100755
--- a/opends/tests/functional-tests/testcases/tasks/cleanup.xml
+++ b/opends/tests/functional-tests/testcases/tasks/cleanup.xml
@@ -24,51 +24,51 @@
! CDDL HEADER END
!
! Portions Copyright 2007 Sun Microsystems, Inc.
- ! -->
+! -->
<stax>
-
+
<defaultcall function="cleanup"/>
<function name="cleanup">
<sequence>
<block name="'cleanup'">
- <sequence>
+ <sequence>
<block name="'Block DS Process Stop'">
- <!--- Stop DS -->
+ <!--- Stop DS -->
<sequence>
<message>
'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 }
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsPort' : DIRECTORY_INSTANCE_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
</call>
<call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
+ { '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 -->
+ <!-- Remove the topology created for the test suite -->
<sequence>
<message>
- 'Remove DS topology created for the Test Suite'
+ 'Remove DS topology created for the Test Suite'
</message>
<call function="'removeTopology'"/>
<call function="'checkRC'">
{ 'returncode' : RC ,
- 'result' : STAXResult }
+ 'result' : STAXResult }
</call>
</sequence>
<!-- End Block Remove DS Topology-->
</block>
</sequence>
</block>
- </sequence>
+ </sequence>
</function>
</stax>
diff --git a/opends/tests/functional-tests/testcases/tasks/export-ldif.xml b/opends/tests/functional-tests/testcases/tasks/export-ldif.xml
index cceabde..8fa9adf 100644
--- a/opends/tests/functional-tests/testcases/tasks/export-ldif.xml
+++ b/opends/tests/functional-tests/testcases/tasks/export-ldif.xml
@@ -24,19 +24,18 @@
! CDDL HEADER END
!
! Portions Copyright 2006-2007 Sun Microsystems, Inc.
- ! -->
+! -->
<stax>
<defaultcall function="export-ldif"/>
<function name="export-ldif" scope="local">
<block name="STAXCurrentFunction">
- <sequence>
- <script>
- CurrentTestPath['suite']=STAXCurrentFunction
- </script>
- <call function="'testSuite_Preamble'" />
-
-
- <!--- Test Suite information
+ <sequence>
+ <script>
+ CurrentTestPath['suite']=STAXCurrentFunction
+ </script>
+ <call function="'testSuite_Preamble'" />
+
+ <!--- Test Suite information
#@TestSuiteName Tasks
#@TestSuitePurpose Verify that the basic export functionality is working in mode task
#@TestSuiteID export Tests
@@ -47,7 +46,7 @@
-->
- <!--- Test Case information
+ <!--- Test Case information
#@TestMarker Backend export Tests
#@TestName Backend: export: LDIF Default
#@TestID LDIF Default
@@ -59,45 +58,42 @@
#@TestResult
-->
- <testcase name="getTestCaseName('schedule export-ldif task for immediate execution in asynchronous mode')">
- <sequence>
- <call function="'testCase_Preamble'"/>
-
-
-
- <call function="'exportLdif'">
- { 'location' : STAF_REMOTE_HOSTNAME ,
- 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'ldifFile' : '%s/tasks/export_asynchronous' % logsRemoteDataDir,
- 'startTask' : '0',
- 'backEnd' : 'userRoot'}
- </call>
-
- <message>'--- Check log files export_asynchronous ---'</message>
- <call function="'listFolder'">
- { 'location' : '%s' % (STAF_REMOTE_HOSTNAME),
- 'foldername' : '%s/tasks' % logsRemoteDataDir,
- 'filename' : 'export_asynchronous'
- }
- </call>
-
- <!-- check the export ldif file has been created-->
- <if expr="len(cmdResult) == 0">
- <call function="'testFailed'"/>
+ <testcase name="getTestCaseName('schedule export-ldif task for immediate execution in asynchronous mode')">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+
+ <call function="'exportLdif'">
+ { 'location' : STAF_REMOTE_HOSTNAME ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'ldifFile' : '%s/tasks/export_asynchronous' % logsRemoteDataDir,
+ 'startTask' : '0',
+ 'backEnd' : 'userRoot'}
+ </call>
+ <message>'--- Check log files export_asynchronous ---'</message>
+ <call function="'listFolder'">
+ { 'location' : '%s' % (STAF_REMOTE_HOSTNAME),
+ 'foldername' : '%s/tasks' % logsRemoteDataDir,
+ 'filename' : 'export_asynchronous'
+ }
+ </call>
+
+ <!-- check the export ldif file has been created-->
+ <if expr="len(cmdResult) == 0">
+ <call function="'testFailed'"/>
<else>
- <call function="'testPassed'"/>
+ <call function="'testPassed'"/>
</else>
- </if>
-
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
-
- <!--- Test Case information
+ </if>
+
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+
+ <!--- Test Case information
#@TestMarker Backend export Tests
#@TestName Backend: export: LDIF Default
#@TestID LDIF Default
@@ -109,43 +105,42 @@
#@TestResult
-->
- <testcase name="getTestCaseName('schedule export-ldif task for immediate execution in synchronous mode')">
- <sequence>
- <call function="'testCase_Preamble'"/>
-
-
- <call function="'exportLdif'">
- { 'location' : STAF_REMOTE_HOSTNAME ,
- 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'ldifFile' : '%s/tasks/export_synchronous' % logsRemoteDataDir,
- 'backEnd' : 'userRoot'}
- </call>
-
-
- <message>'--- Check log files ---'</message>
- <call function="'listFolder'">
- { 'location' : '%s' % (STAF_REMOTE_HOSTNAME),
- 'foldername' : '%s/tasks' % logsRemoteDataDir,
- 'filename' : 'export_synchronous'
- }
- </call>
- <!-- check the export ldif file has been created-->
- <if expr="len(cmdResult) == 0">
- <call function="'testFailed'"/>
+ <testcase name="getTestCaseName('schedule export-ldif task for immediate execution in synchronous mode')">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+
+ <call function="'exportLdif'">
+ { 'location' : STAF_REMOTE_HOSTNAME ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'ldifFile' : '%s/tasks/export_synchronous' % logsRemoteDataDir,
+ 'backEnd' : 'userRoot'}
+ </call>
+
+
+ <message>'--- Check log files ---'</message>
+ <call function="'listFolder'">
+ { 'location' : '%s' % (STAF_REMOTE_HOSTNAME),
+ 'foldername' : '%s/tasks' % logsRemoteDataDir,
+ 'filename' : 'export_synchronous'
+ }
+ </call>
+ <!-- check the export ldif file has been created-->
+ <if expr="len(cmdResult) == 0">
+ <call function="'testFailed'"/>
<else>
- <call function="'testPassed'"/>
+ <call function="'testPassed'"/>
</else>
- </if>
-
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
-
- <!--- Test Case information
+ </if>
+
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+
+ <!--- Test Case information
#@TestMarker Backend export Tests
#@TestName Backend: export: LDIF Default
#@TestID LDIF Default
@@ -157,55 +152,55 @@
#@TestResult
-->
- <testcase name="getTestCaseName('schedule export-ldif task for scheduled execution in asynchronous mode')">
- <sequence>
- <call function="'testCase_Preamble'"/>
-
-
- <call function="'exportLdif'">
- { 'location' : STAF_REMOTE_HOSTNAME ,
- 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'ldifFile' : '%s/tasks/export_schedule_asynchronous' % logsRemoteDataDir,
- 'startTask' : '20061212000000',
- 'backEnd' : 'userRoot'}
- </call>
-
- <message>'--- Check log files export_asynchronous ---'</message>
- <call function="'listFolder'">
- { 'location' : '%s' % (STAF_REMOTE_HOSTNAME),
- 'foldername' : '%s/tasks' % logsRemoteDataDir,
- 'filename' : 'export_schedule_asynchronous'
- }
- </call>
-
- <!-- check the export ldif file has been created-->
- <if expr="len(cmdResult) == 0">
- <call function="'testFailed'"/>
+ <testcase name="getTestCaseName('schedule export-ldif task for scheduled execution in asynchronous mode')">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+
+
+ <call function="'exportLdif'">
+ { 'location' : STAF_REMOTE_HOSTNAME ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'ldifFile' : '%s/tasks/export_schedule_asynchronous' % logsRemoteDataDir,
+ 'startTask' : '20061212000000',
+ 'backEnd' : 'userRoot'}
+ </call>
+
+ <message>'--- Check log files export_asynchronous ---'</message>
+ <call function="'listFolder'">
+ { 'location' : '%s' % (STAF_REMOTE_HOSTNAME),
+ 'foldername' : '%s/tasks' % logsRemoteDataDir,
+ 'filename' : 'export_schedule_asynchronous'
+ }
+ </call>
+
+ <!-- check the export ldif file has been created-->
+ <if expr="len(cmdResult) == 0">
+ <call function="'testFailed'"/>
<else>
- <call function="'testPassed'"/>
+ <call function="'testPassed'"/>
</else>
- </if>
-
-
- <call function="'RestartDs'">
- { 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ </if>
+
+
+ <call function="'RestartDs'">
+ { 'dsHost' : DIRECTORY_INSTANCE_HOST,
'dsPort' : DIRECTORY_INSTANCE_PORT,
'dsBindDN' : DIRECTORY_INSTANCE_DN,
'dsBindPwd' : DIRECTORY_INSTANCE_PSWD
- }
- </call>
-
-
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
-
- <call function="'testSuite_Postamble'" />
- </sequence>
- </block>
-</function>
+ }
+ </call>
+
+
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+
+ <call function="'testSuite_Postamble'" />
+ </sequence>
+ </block>
+ </function>
</stax>
diff --git a/opends/tests/functional-tests/testcases/tasks/import-ldif.xml b/opends/tests/functional-tests/testcases/tasks/import-ldif.xml
index 4599e24..8bc73cc 100644
--- a/opends/tests/functional-tests/testcases/tasks/import-ldif.xml
+++ b/opends/tests/functional-tests/testcases/tasks/import-ldif.xml
@@ -24,19 +24,19 @@
! CDDL HEADER END
!
! Portions Copyright 2006-2007 Sun Microsystems, Inc.
- ! -->
+! -->
<stax>
<defaultcall function="import-ldif"/>
<function name="import-ldif" scope="local">
<block name="STAXCurrentFunction">
- <sequence>
- <script>
- CurrentTestPath['suite']=STAXCurrentFunction
- </script>
- <call function="'testSuite_Preamble'" />
-
-
- <!--- Test Suite information
+ <sequence>
+ <script>
+ CurrentTestPath['suite']=STAXCurrentFunction
+ </script>
+ <call function="'testSuite_Preamble'" />
+
+
+ <!--- Test Suite information
#@TestSuiteName Tasks
#@TestSuitePurpose Verify that the basic import functionality is working in mode task
#@TestSuiteID Import Tests
@@ -47,7 +47,7 @@
-->
- <!--- Test Case information
+ <!--- Test Case information
#@TestMarker Backend Import Tests
#@TestName Backend: Import: LDIF Default
#@TestID LDIF Default
@@ -59,51 +59,51 @@
#@TestResult
-->
- <testcase name="getTestCaseName('schedule import-ldif task for immediate execution in synchronous mode')">
- <sequence>
- <call function="'testCase_Preamble'"/>
-
- <call function="'ImportLdifWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME ,
- 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'dsLdifFile' : '%s/tasks/import.ldif' % logsRemoteDataDir,
- 'dsAppend' : ' ',
- 'dsBackEnd' : 'userRoot'}
- </call>
-
- <!-- Check data are imported -->
- <call function="'checkImport'">
- { 'expectedEntries' : ['uid=scarter,dc=example,dc=com',
- 'uid=tmorris, dc=example,dc=com'],
- 'startDS' : 'False'
- }
- </call>
-
- <!-- Delete entries -->
- <call function="'DeleteEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : 'uid=scarter,dc=example,dc=com' }
- </call>
- <call function="'DeleteEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : 'uid=tmorris,dc=example,dc=com' }
- </call>
-
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
-
- <!--- Test Case information
+ <testcase name="getTestCaseName('schedule import-ldif task for immediate execution in synchronous mode')">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+
+ <call function="'ImportLdifWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'dsLdifFile' : '%s/tasks/import.ldif' % logsRemoteDataDir,
+ 'dsAppend' : ' ',
+ 'dsBackEnd' : 'userRoot'}
+ </call>
+
+ <!-- Check data are imported -->
+ <call function="'checkImport'">
+ { 'expectedEntries' : ['uid=scarter,dc=example,dc=com',
+ 'uid=tmorris, dc=example,dc=com'],
+ 'startDS' : 'False'
+ }
+ </call>
+
+ <!-- Delete entries -->
+ <call function="'DeleteEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : 'uid=scarter,dc=example,dc=com' }
+ </call>
+ <call function="'DeleteEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : 'uid=tmorris,dc=example,dc=com' }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+
+ <!--- Test Case information
#@TestMarker Backend Import Tests
#@TestName Backend: Import: LDIF Default
#@TestID LDIF Default
@@ -115,57 +115,57 @@
#@TestResult
-->
- <testcase name="getTestCaseName('schedule import-ldif task for immediate execution in asynchronous mode')">
- <sequence>
- <call function="'testCase_Preamble'"/>
-
- <call function="'ImportLdifWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME ,
- 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'dsLdifFile' : '%s/tasks/import.ldif' % logsRemoteDataDir,
- 'dsAppend' : ' ',
- 'startTask' : '0',
- 'dsBackEnd' : 'userRoot'}
- </call>
- <call function="'Sleep'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'sleepForMilliSeconds' : 90000 }
- </call>
-
- <!-- Check data are imported -->
- <call function="'checkImport'">
- { 'expectedEntries' : ['uid=scarter,dc=example,dc=com',
- 'uid=tmorris, dc=example,dc=com'],
- 'startDS' : 'False'
- }
- </call>
-
- <!-- Delete entries -->
- <call function="'DeleteEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : 'uid=scarter,dc=example,dc=com' }
- </call>
- <call function="'DeleteEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : 'uid=tmorris,dc=example,dc=com' }
- </call>
-
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
-
-
- <!--- Test Case information
+ <testcase name="getTestCaseName('schedule import-ldif task for immediate execution in asynchronous mode')">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+
+ <call function="'ImportLdifWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'dsLdifFile' : '%s/tasks/import.ldif' % logsRemoteDataDir,
+ 'dsAppend' : ' ',
+ 'startTask' : '0',
+ 'dsBackEnd' : 'userRoot'}
+ </call>
+ <call function="'Sleep'">
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'sleepForMilliSeconds' : 90000 }
+ </call>
+
+ <!-- Check data are imported -->
+ <call function="'checkImport'">
+ { 'expectedEntries' : ['uid=scarter,dc=example,dc=com',
+ 'uid=tmorris, dc=example,dc=com'],
+ 'startDS' : 'False'
+ }
+ </call>
+
+ <!-- Delete entries -->
+ <call function="'DeleteEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : 'uid=scarter,dc=example,dc=com' }
+ </call>
+ <call function="'DeleteEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : 'uid=tmorris,dc=example,dc=com' }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+
+
+ <!--- Test Case information
#@TestMarker Backend Import Tests
#@TestName Backend: Import: LDIF Default
#@TestID LDIF Default
@@ -177,56 +177,56 @@
#@TestResult
-->
- <testcase name="getTestCaseName('schedule import-ldif task for scheduled execution in asynchronous mode')">
- <sequence>
- <call function="'testCase_Preamble'"/>
-
- <call function="'ImportLdifWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME ,
- 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'dsLdifFile' : '%s/tasks/import.ldif' % logsRemoteDataDir,
- 'dsAppend' : ' ',
- 'startTask' : '20061212000000',
- 'dsBackEnd' : 'userRoot'}
- </call>
- <call function="'Sleep'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'sleepForMilliSeconds' : 90000 }
- </call>
-
- <!-- Check data are imported -->
- <call function="'checkImport'">
- { 'expectedEntries' : ['uid=scarter,dc=example,dc=com',
- 'uid=tmorris, dc=example,dc=com'],
- 'startDS' : 'False'
- }
- </call>
-
- <!-- Delete entries -->
- <call function="'DeleteEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : 'uid=scarter,dc=example,dc=com' }
- </call>
- <call function="'DeleteEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : 'uid=tmorris,dc=example,dc=com' }
- </call>
-
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <call function="'testSuite_Postamble'" />
- </sequence>
- </block>
-</function>
+ <testcase name="getTestCaseName('schedule import-ldif task for scheduled execution in asynchronous mode')">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+
+ <call function="'ImportLdifWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'dsLdifFile' : '%s/tasks/import.ldif' % logsRemoteDataDir,
+ 'dsAppend' : ' ',
+ 'startTask' : '20061212000000',
+ 'dsBackEnd' : 'userRoot'}
+ </call>
+ <call function="'Sleep'">
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'sleepForMilliSeconds' : 90000 }
+ </call>
+
+ <!-- Check data are imported -->
+ <call function="'checkImport'">
+ { 'expectedEntries' : ['uid=scarter,dc=example,dc=com',
+ 'uid=tmorris, dc=example,dc=com'],
+ 'startDS' : 'False'
+ }
+ </call>
+
+ <!-- Delete entries -->
+ <call function="'DeleteEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : 'uid=scarter,dc=example,dc=com' }
+ </call>
+ <call function="'DeleteEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : 'uid=tmorris,dc=example,dc=com' }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+ <call function="'testSuite_Postamble'" />
+ </sequence>
+ </block>
+ </function>
</stax>
diff --git a/opends/tests/functional-tests/testcases/tasks/restart_db.xml b/opends/tests/functional-tests/testcases/tasks/restart_db.xml
index 2db3f54..1fa053f 100644
--- a/opends/tests/functional-tests/testcases/tasks/restart_db.xml
+++ b/opends/tests/functional-tests/testcases/tasks/restart_db.xml
@@ -24,19 +24,19 @@
! CDDL HEADER END
!
! Portions Copyright 2006-2007 Sun Microsystems, Inc.
- ! -->
+! -->
<stax>
<defaultcall function="restart_db"/>
<function name="restart_db" scope="local">
<block name="STAXCurrentFunction">
- <sequence>
- <script>
- CurrentTestPath['suite']=STAXCurrentFunction
- </script>
- <call function="'testSuite_Preamble'" />
-
-
- <!--- Test Suite information
+ <sequence>
+ <script>
+ CurrentTestPath['suite']=STAXCurrentFunction
+ </script>
+ <call function="'testSuite_Preamble'" />
+
+
+ <!--- Test Suite information
#@TestSuiteName Tasks
#@TestSuitePurpose Verify that the restart functionality is working in mode task
#@TestSuiteID restart Tests
@@ -48,7 +48,7 @@
- <!--- Test Case information
+ <!--- Test Case information
#@TestMarker Backend restart Tests
#@TestName Backend: restart
#@TestPurpose schedule a restart in task mode to be executed immedialy in asynchronous mode
@@ -59,43 +59,43 @@
#@TestResult
-->
- <testcase name="getTestCaseName('schedule restart task for scheduled execution in asynchronous mode')">
- <sequence>
- <call function="'testCase_Preamble'"/>
-
-
- <call function="'StopDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD,
- 'dsRestart' : ' ',
- 'dsStopTime' : '20061212000000' }
- </call>
-
- <call function="'Sleep'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'sleepForMilliSeconds' : 10000 }
- </call>
-
- <call function="'SearchObject'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : DIRECTORY_INSTANCE_SFX,
- 'dsFilter' : 'objectclass=*' ,
- 'dsScope' : 'base',
- 'expectedRC' : 0 }
- </call>
-
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
-
- <!--- Test Case information
+ <testcase name="getTestCaseName('schedule restart task for scheduled execution in asynchronous mode')">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+
+
+ <call function="'StopDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsPort' : DIRECTORY_INSTANCE_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD,
+ 'dsRestart' : ' ',
+ 'dsStopTime' : '20061212000000' }
+ </call>
+
+ <call function="'Sleep'">
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'sleepForMilliSeconds' : 10000 }
+ </call>
+
+ <call function="'SearchObject'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : DIRECTORY_INSTANCE_SFX,
+ 'dsFilter' : 'objectclass=*' ,
+ 'dsScope' : 'base',
+ 'expectedRC' : 0 }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+
+ <!--- Test Case information
#@TestMarker Backend stop Tests
#@TestName Backend: stop
#@TestPurpose schedule a stop in task mode to be executed immedialy in asynchronous mode
@@ -106,42 +106,42 @@
#@TestResult
-->
- <testcase name="getTestCaseName('schedule stop server task for scheduled execution in asynchronous mode')">
- <sequence>
- <call function="'testCase_Preamble'"/>
-
-
- <call function="'StopDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD,
- 'dsStopTime' : '20061212000000' }
- </call>
-
- <call function="'SearchObject'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : DIRECTORY_INSTANCE_SFX,
- 'dsFilter' : 'objectclass=*' ,
- 'dsScope' : 'base',
- 'expectedRC' : 91 }
- </call>
-
- <!--- Start DS -->
- <call function="'StartDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME }
- </call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
-
- <call function="'testSuite_Postamble'" />
- </sequence>
- </block>
-</function>
+ <testcase name="getTestCaseName('schedule stop server task for scheduled execution in asynchronous mode')">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+
+
+ <call function="'StopDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsPort' : DIRECTORY_INSTANCE_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD,
+ 'dsStopTime' : '20061212000000' }
+ </call>
+
+ <call function="'SearchObject'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : DIRECTORY_INSTANCE_SFX,
+ 'dsFilter' : 'objectclass=*' ,
+ 'dsScope' : 'base',
+ 'expectedRC' : 91 }
+ </call>
+
+ <!--- Start DS -->
+ <call function="'StartDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+
+ <call function="'testSuite_Postamble'" />
+ </sequence>
+ </block>
+ </function>
</stax>
diff --git a/opends/tests/functional-tests/testcases/tasks/restore_db.xml b/opends/tests/functional-tests/testcases/tasks/restore_db.xml
index d8f20c5..281db06 100644
--- a/opends/tests/functional-tests/testcases/tasks/restore_db.xml
+++ b/opends/tests/functional-tests/testcases/tasks/restore_db.xml
@@ -24,19 +24,19 @@
! CDDL HEADER END
!
! Portions Copyright 2006-2007 Sun Microsystems, Inc.
- ! -->
+! -->
<stax>
<defaultcall function="restore_db"/>
<function name="restore_db" scope="local">
<block name="STAXCurrentFunction">
- <sequence>
- <script>
- CurrentTestPath['suite']=STAXCurrentFunction
- </script>
- <call function="'testSuite_Preamble'" />
-
-
- <!--- Test Suite information
+ <sequence>
+ <script>
+ CurrentTestPath['suite']=STAXCurrentFunction
+ </script>
+ <call function="'testSuite_Preamble'" />
+
+
+ <!--- Test Suite information
#@TestSuiteName Tasks
#@TestSuitePurpose Verify that the restore functionality is working in mode task
#@TestSuiteID restore Tests
@@ -47,7 +47,7 @@
-->
- <!--- Test Case information
+ <!--- Test Case information
#@TestMarker Backend restore Tests
#@TestName Backend: restore
#@TestID LDIF Default
@@ -59,29 +59,29 @@
#@TestResult
-->
- <testcase name="getTestCaseName('schedule restore task for immediate execution in asynchronous mode')">
- <sequence>
- <call function="'testCase_Preamble'"/>
-
-
-
- <call function="'restore'">
- { 'location' : STAF_REMOTE_HOSTNAME ,
- 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'backupDir' : '%s/tasks/backup_asynchronous' % logsRemoteDataDir,
- 'startTask' : '0'}
- </call>
-
-
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
-
- <!--- Test Case information
+ <testcase name="getTestCaseName('schedule restore task for immediate execution in asynchronous mode')">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+
+
+
+ <call function="'restore'">
+ { 'location' : STAF_REMOTE_HOSTNAME ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'backupDir' : '%s/tasks/backup_asynchronous' % logsRemoteDataDir,
+ 'startTask' : '0'}
+ </call>
+
+
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+
+ <!--- Test Case information
#@TestMarker Backend restore
#@TestName Backend: restore
#@TestPurpose schedule a restore in task mode to be executed immedialy in synchronous mode
@@ -92,27 +92,27 @@
#@TestResult
-->
- <testcase name="getTestCaseName('schedule restore task for immediate execution in synchronous mode')">
- <sequence>
- <call function="'testCase_Preamble'"/>
-
-
- <call function="'restore'">
- { 'location' : STAF_REMOTE_HOSTNAME ,
- 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'backupDir' : '%s/tasks/backup_synchronous' % logsRemoteDataDir}
- </call>
-
-
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
-
- <!--- Test Case information
+ <testcase name="getTestCaseName('schedule restore task for immediate execution in synchronous mode')">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+
+
+ <call function="'restore'">
+ { 'location' : STAF_REMOTE_HOSTNAME ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'backupDir' : '%s/tasks/backup_synchronous' % logsRemoteDataDir}
+ </call>
+
+
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+
+ <!--- Test Case information
#@TestMarker Backend restore
#@TestName Backend: restore
#@TestID LDIF Default
@@ -124,36 +124,36 @@
#@TestResult
-->
- <testcase name="getTestCaseName('schedule restore task for scheduled execution in asynchronous mode')">
- <sequence>
- <call function="'testCase_Preamble'"/>
-
- <script>
- mydate=strftime("%Y%m%d%H%M%S",localtime())
- </script>
-
-
-
- <call function="'restore'">
- { 'location' : STAF_REMOTE_HOSTNAME ,
- 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'startTask' : '%s' % mydate,
- 'backupDir' : '%s/tasks/backup_schedule_asynchronous' % logsRemoteDataDir
- }
- </call>
-
-
-
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
-
- <call function="'testSuite_Postamble'" />
- </sequence>
- </block>
-</function>
+ <testcase name="getTestCaseName('schedule restore task for scheduled execution in asynchronous mode')">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+
+ <script>
+ mydate=strftime("%Y%m%d%H%M%S",localtime())
+ </script>
+
+
+
+ <call function="'restore'">
+ { 'location' : STAF_REMOTE_HOSTNAME ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'startTask' : '%s' % mydate,
+ 'backupDir' : '%s/tasks/backup_schedule_asynchronous' % logsRemoteDataDir
+ }
+ </call>
+
+
+
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
+
+ <call function="'testSuite_Postamble'" />
+ </sequence>
+ </block>
+ </function>
</stax>
diff --git a/opends/tests/functional-tests/testcases/tasks/setup.xml b/opends/tests/functional-tests/testcases/tasks/setup.xml
index c94f81b..9bc2fc6 100755
--- a/opends/tests/functional-tests/testcases/tasks/setup.xml
+++ b/opends/tests/functional-tests/testcases/tasks/setup.xml
@@ -24,65 +24,65 @@
! CDDL HEADER END
!
! Portions Copyright 2007 Sun Microsystems, Inc.
- ! -->
+! -->
<stax>
-
+
<defaultcall function="setup"/>
<function name="setup">
<sequence>
<block name="'setup'">
- <sequence>
- <block name="'Block Create DS Topology'">
- <!-- Create the topology necessary to the test group/suite -->
- <sequence>
+ <sequence>
+ <block name="'Block Create DS Topology'">
+ <!-- Create the topology necessary to the test group/suite -->
+ <sequence>
<message>
- 'Create DS topology as described in config.py'
+ 'Create DS topology as described in config.py'
</message>
- <call function="'createTopology'">
- { 'initialiseInstance' : True }
- </call>
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- </sequence>
- <!--- End Block Create DS Topology -->
- </block>
- <block name="'Block DS Process Active'">
- <!--- Start DS -->
- <sequence>
- <message>
- 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <!--- Start DS -->
- <call function="'StartDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- <!--- Check that DS started -->
- <call function="'isAlive'">
- { 'noOfLoops' : 5 ,
- 'noOfMilliSeconds' : 2000 }
- </call>
-
- <call function="'ldapSearchWithScript'">
- { 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : 'dc=com' ,
- 'dsFilter' : 'objectclass=*' }
- </call>
-
- </sequence>
- <!--- End Block DS Process Active -->
- </block>
- </sequence>
+ <call function="'createTopology'">
+ { 'initialiseInstance' : True }
+ </call>
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ </sequence>
+ <!--- End Block Create DS Topology -->
+ </block>
+ <block name="'Block DS Process Active'">
+ <!--- Start DS -->
+ <sequence>
+ <message>
+ 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
+ </message>
+
+ <!--- Start DS -->
+ <call function="'StartDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 5 ,
+ 'noOfMilliSeconds' : 2000 }
+ </call>
+
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : 'dc=com' ,
+ 'dsFilter' : 'objectclass=*' }
+ </call>
+
+ </sequence>
+ <!--- End Block DS Process Active -->
+ </block>
+ </sequence>
</block>
</sequence>
</function>
diff --git a/opends/tests/functional-tests/testcases/tasks/tasks.xml b/opends/tests/functional-tests/testcases/tasks/tasks.xml
index dbaa4c7..1f4a4d8 100644
--- a/opends/tests/functional-tests/testcases/tasks/tasks.xml
+++ b/opends/tests/functional-tests/testcases/tasks/tasks.xml
@@ -24,16 +24,16 @@
! CDDL HEADER END
!
! Portions Copyright 2006-2007 Sun Microsystems, Inc.
- ! -->
+! -->
<stax>
<defaultcall function="main_tasks"/>
<function name="main_tasks">
<sequence>
<block name="'tasks'">
- <sequence>
- <script>
- CurrentTestPath['group']='tasks'
- </script>
+ <sequence>
+ <script>
+ CurrentTestPath['group']='tasks'
+ </script>
<call function="'testGroup_Preamble'" />
<iterate var="_test" in="['setup','restart_db','export-ldif','import-ldif','backup_db','restore_db','cleanup']" >
--
Gitblit v1.10.0