From ba0e39ad72654893c030b2996729731baa6f475b Mon Sep 17 00:00:00 2001
From: Gary Williams <gary.williams@forgerock.com>
Date: Thu, 22 Sep 2011 16:28:33 +0000
Subject: [PATCH] Additional testcases using incorrectly data folder in tasks suite
---
opends/tests/staf-tests/functional-tests/testcases/tasks/export-ldif.xml | 13 +++++++------
opends/tests/staf-tests/functional-tests/testcases/tasks/allowed-tasks.xml | 3 ++-
opends/tests/staf-tests/functional-tests/testcases/tasks/backup_db.xml | 15 ++++++++-------
opends/tests/staf-tests/functional-tests/testcases/tasks/import-ldif.xml | 1 +
4 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/opends/tests/staf-tests/functional-tests/testcases/tasks/allowed-tasks.xml b/opends/tests/staf-tests/functional-tests/testcases/tasks/allowed-tasks.xml
index 0ccb542..35ddca3 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/tasks/allowed-tasks.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/tasks/allowed-tasks.xml
@@ -24,6 +24,7 @@
! CDDL HEADER END
!
! Copyright 2007-2009 Sun Microsystems, Inc.
+ ! Portions Copyright 2011 ForgeRock AS.
! -->
<stax>
<defaultcall function="allowed-tasks"/>
@@ -88,7 +89,7 @@
'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'ldifFile' : '%s/tasks/export_asynchronous' % remote.data,
+ 'ldifFile' : '%s/tasks/export_asynchronous' % remote.temp,
'startTask' : '0',
'backEnd' : DIRECTORY_INSTANCE_BE,
'expectedRC' : 1}
diff --git a/opends/tests/staf-tests/functional-tests/testcases/tasks/backup_db.xml b/opends/tests/staf-tests/functional-tests/testcases/tasks/backup_db.xml
index e2313ef..ee72112 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/tasks/backup_db.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/tasks/backup_db.xml
@@ -24,6 +24,7 @@
! CDDL HEADER END
!
! Copyright 2007-2009 Sun Microsystems, Inc.
+ ! Portions Copyright 2011 ForgeRock AS.
! -->
<stax>
<defaultcall function="backup_db"/>
@@ -97,7 +98,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'schedulePattern' : '"0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,32,34,36,38,40,42,44,46,48,50,52,54,56,58 * * * *"',
- 'backupDir' : '%s/tasks/backup_recurring_schedule_asynchronous' % remote.data,
+ 'backupDir' : '%s/tasks/backup_recurring_schedule_asynchronous' % remote.temp,
'backupID' : 'recurring-backup-1',
'backEnd' : DIRECTORY_INSTANCE_BE}
</call>
@@ -215,7 +216,7 @@
'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'backupDir' : '%s/tasks/backup_asynchronous' % remote.data,
+ 'backupDir' : '%s/tasks/backup_asynchronous' % remote.temp,
'startTask' : '0',
'backEnd' : DIRECTORY_INSTANCE_BE}
</call>
@@ -260,7 +261,7 @@
<message>'--- Check log files backup_asynchronous ---'</message>
<call function="'listFolder'">
{ 'location' : '%s' % (STAF_REMOTE_HOSTNAME),
- 'foldername' : '%s/tasks' % remote.data,
+ 'foldername' : '%s/tasks' % remote.temp,
'filename' : 'backup_asynchronous'
}
</call>
@@ -300,7 +301,7 @@
'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'backupDir' : '%s/tasks/backup_synchronous' % remote.data,
+ 'backupDir' : '%s/tasks/backup_synchronous' % remote.temp,
'backEnd' : DIRECTORY_INSTANCE_BE}
</call>
@@ -344,7 +345,7 @@
<message>'--- Check log files ---'</message>
<call function="'listFolder'">
{ 'location' : '%s' % (STAF_REMOTE_HOSTNAME),
- 'foldername' : '%s/tasks' % remote.data,
+ 'foldername' : '%s/tasks' % remote.temp,
'filename' : 'backup_synchronous'
}
</call>
@@ -385,7 +386,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'startTask' : '20061212000000',
- 'backupDir' : '%s/tasks/backup_schedule_asynchronous' % remote.data,
+ 'backupDir' : '%s/tasks/backup_schedule_asynchronous' % remote.temp,
'backEnd' : DIRECTORY_INSTANCE_BE}
</call>
@@ -469,7 +470,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'schedulePattern' : '"0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,32,34,36,38,40,42,44,46,48,50,52,54,56,58 * * * *"',
- 'backupDir' : '%s/tasks/backup_recurring_schedule_asynchronous' % remote.data,
+ 'backupDir' : '%s/tasks/backup_recurring_schedule_asynchronous' % remote.temp,
'backupID' : 'recurring-backup-1',
'backEnd' : DIRECTORY_INSTANCE_BE}
</call>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/tasks/export-ldif.xml b/opends/tests/staf-tests/functional-tests/testcases/tasks/export-ldif.xml
index 6c98300..19a3653 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/tasks/export-ldif.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/tasks/export-ldif.xml
@@ -24,6 +24,7 @@
! CDDL HEADER END
!
! Copyright 2007-2009 Sun Microsystems, Inc.
+ ! Portions Copyright 2011 ForgeRock AS.
! -->
<stax>
<defaultcall function="export-ldif"/>
@@ -77,7 +78,7 @@
'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'ldifFile' : '%s/tasks/export_asynchronous' % remote.data,
+ 'ldifFile' : '%s/tasks/export_asynchronous' % remote.temp,
'startTask' : '0',
'backEnd' : DIRECTORY_INSTANCE_BE}
</call>
@@ -122,7 +123,7 @@
<message>'--- Check log files export_asynchronous ---'</message>
<call function="'listFolder'">
{ 'location' : '%s' % (STAF_REMOTE_HOSTNAME),
- 'foldername' : '%s/tasks' % remote.data,
+ 'foldername' : '%s/tasks' % remote.temp,
'filename' : 'export_asynchronous'
}
</call>
@@ -163,7 +164,7 @@
'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'ldifFile' : '%s/tasks/export_synchronous' % remote.data,
+ 'ldifFile' : '%s/tasks/export_synchronous' % remote.temp,
'backEnd' : DIRECTORY_INSTANCE_BE}
</call>
@@ -207,7 +208,7 @@
<message>'--- Check log files ---'</message>
<call function="'listFolder'">
{ 'location' : '%s' % (STAF_REMOTE_HOSTNAME),
- 'foldername' : '%s/tasks' % remote.data,
+ 'foldername' : '%s/tasks' % remote.temp,
'filename' : 'export_synchronous'
}
</call>
@@ -246,7 +247,7 @@
'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'ldifFile' : '%s/tasks/export_schedule_asynchronous' % remote.data,
+ 'ldifFile' : '%s/tasks/export_schedule_asynchronous' % remote.temp,
'startTask' : '20061212000000',
'expectedRC' : 1,
'backEnd' : DIRECTORY_INSTANCE_BE}
@@ -304,7 +305,7 @@
'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'ldifFile' : '%s/tasks/export_schedule_recurring' % remote.data,
+ 'ldifFile' : '%s/tasks/export_schedule_recurring' % remote.temp,
'schedulePattern' : '"0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,32,34,36,38,40,42,44,46,48,50,52,54,56,58 * * * *"',
'backEnd' : DIRECTORY_INSTANCE_BE}
</call>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/tasks/import-ldif.xml b/opends/tests/staf-tests/functional-tests/testcases/tasks/import-ldif.xml
index 57b825d..a2f7067 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/tasks/import-ldif.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/tasks/import-ldif.xml
@@ -24,6 +24,7 @@
! CDDL HEADER END
!
! Copyright 2007-2010 Sun Microsystems, Inc.
+ ! Portions Copyright 2011 ForgeRock AS.
! -->
<stax>
<defaultcall function="import-ldif"/>
--
Gitblit v1.10.0