From 1cf1768600790447180bc5f6eca9daac2fec00fa Mon Sep 17 00:00:00 2001
From: smaguin <smaguin@localhost>
Date: Fri, 14 Mar 2008 07:53:28 +0000
Subject: [PATCH] add manage-tasks
---
opendj-sdk/opends/tests/functional-tests/testcases/tasks/export-ldif.xml | 32 +++++++++++-----
opendj-sdk/opends/tests/functional-tests/testcases/tasks/backup_db.xml | 23 +++++++++++
opendj-sdk/opends/tests/functional-tests/testcases/tasks/import-ldif.xml | 27 ++++++++++++-
opendj-sdk/opends/tests/functional-tests/testcases/tasks/restore_db.xml | 23 +++++++++++
4 files changed, 92 insertions(+), 13 deletions(-)
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/tasks/backup_db.xml b/opendj-sdk/opends/tests/functional-tests/testcases/tasks/backup_db.xml
index 8cd7591..a690d3c 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/tasks/backup_db.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/tasks/backup_db.xml
@@ -53,6 +53,7 @@
#@TestPurpose Schedule a backup in task mode to be executed immedialy in asynchronous mode
#@TestPreamble
#@TestStep Execute a backup in mode task
+ #@TestStep Execute manage-tasks tools and check a backup task is managed
#@TestStep Specify the -t 0
#@TestStep The task is scheduled for immediate execution
#@TestSteps The script returns immedialy after scheduling the task
@@ -75,6 +76,28 @@
'startTask' : '0',
'backEnd' : 'userRoot'}
</call>
+
+ <!-- manage-tasks -->
+ <call function="'manage-tasks'">
+ { 'location' : STAF_REMOTE_HOSTNAME ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'dsQuiet' : ' '
+ }
+ </call>
+
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+
+ <call function="'searchStringForSubstring'">
+ { 'returnString' : returnString,
+ 'testString' : 'Backup',
+ 'expectedResult' : '1' }
+ </call>
+
<message>'--- Check log files backup_asynchronous ---'</message>
<call function="'listFolder'">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/tasks/export-ldif.xml b/opendj-sdk/opends/tests/functional-tests/testcases/tasks/export-ldif.xml
index 2955b45..2058d29 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/tasks/export-ldif.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/tasks/export-ldif.xml
@@ -101,6 +101,7 @@
#@TestPurpose Schedule a Export in task mode to be executed immedialy in synchronous mode
#@TestPreamble
#@TestStep Execute a export-ldif in a task
+ #@TestStep Execute manage-tasks output and check the Export task is returned
#@TestStep Don't specify the -t option
#@TestStep The task is scheduled for immediate execution and the script must wait the end of the export
#@TestPostamble
@@ -121,6 +122,27 @@
'backEnd' : 'userRoot'}
</call>
+ <!-- manage-tasks -->
+ <call function="'manage-tasks'">
+ { 'location' : STAF_REMOTE_HOSTNAME ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'dsQuiet' : ' '
+ }
+ </call>
+
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+
+ <call function="'searchStringForSubstring'">
+ { 'returnString' : returnString,
+ 'testString' : 'Export',
+ 'expectedResult' : '1' }
+ </call>
+
<message>'--- Check log files ---'</message>
<call function="'listFolder'">
@@ -185,16 +207,6 @@
</else>
</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>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/tasks/import-ldif.xml b/opendj-sdk/opends/tests/functional-tests/testcases/tasks/import-ldif.xml
index eded4a0..06e4f3c 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/tasks/import-ldif.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/tasks/import-ldif.xml
@@ -53,6 +53,7 @@
#@TestPurpose Schedule a import in task mode to be executed immedialy in synchronous mode
#@TestPreamble
#@TestStep Execute a import-ldif in a task
+ #@TestStep Execute manage-tasks output and check the Import task is returned
#@TestStep Don't specify the -t option
#@TestStep The task is scheduled for immediate execution and the script must wait the end of the import
#@TestPostamble
@@ -73,6 +74,28 @@
'dsAppend' : ' ',
'dsBackEnd' : 'userRoot'}
</call>
+
+ <!-- manage-tasks -->
+ <call function="'manage-tasks'">
+ { 'location' : STAF_REMOTE_HOSTNAME ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'dsQuiet' : ' '
+ }
+ </call>
+
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+
+ <call function="'searchStringForSubstring'">
+ { 'returnString' : returnString,
+ 'testString' : 'Import',
+ 'expectedResult' : '1' }
+ </call>
+
<!-- Check data are imported -->
<call function="'checkImport'">
@@ -133,7 +156,7 @@
</call>
<call function="'Sleep'">
{ 'location' : STAF_REMOTE_HOSTNAME,
- 'sleepForMilliSeconds' : 90000 }
+ 'sleepForMilliSeconds' : 40000 }
</call>
<!-- Check data are imported -->
@@ -194,7 +217,7 @@
</call>
<call function="'Sleep'">
{ 'location' : STAF_REMOTE_HOSTNAME,
- 'sleepForMilliSeconds' : 90000 }
+ 'sleepForMilliSeconds' : 40000 }
</call>
<!-- Check data are imported -->
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/tasks/restore_db.xml b/opendj-sdk/opends/tests/functional-tests/testcases/tasks/restore_db.xml
index 5478dbf..2428e82 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/tasks/restore_db.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/tasks/restore_db.xml
@@ -83,6 +83,7 @@
#@TestPurpose Schedule a restore in task mode to be executed immedialy in synchronous mode
#@TestPreamble
#@TestStep Execute a restore in a task
+ #@TestStep Execute manage-tasks tools and check an Restore tasks is managed
#@TestStep Don't specify the -t option
#@TestStep The task is scheduled for immediate execution and the script must wait the end of the restore
#@TestPostamble
@@ -102,7 +103,27 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'backupDir' : '%s/tasks/backup_synchronous' % logsRemoteDataDir}
</call>
-
+
+ <!-- manage-tasks -->
+ <call function="'manage-tasks'">
+ { 'location' : STAF_REMOTE_HOSTNAME ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'dsQuiet' : ' '
+ }
+ </call>
+
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+
+ <call function="'searchStringForSubstring'">
+ { 'returnString' : returnString,
+ 'testString' : 'Restore',
+ 'expectedResult' : '1' }
+ </call>
<call function="'testCase_Postamble'"/>
</sequence>
--
Gitblit v1.10.0