From 21c4e1ffbb5286d131b6a78b8c62d02efd926158 Mon Sep 17 00:00:00 2001
From: Gary Williams <gary.williams@forgerock.com>
Date: Fri, 02 Sep 2011 09:00:32 +0000
Subject: [PATCH] ensure temporary data is writtin into remote.temp folder
---
opends/tests/staf-tests/functional-tests/testcases/backends/restore-tasks/restore-tasks_tests.xml | 13 +-
opends/tests/staf-tests/functional-tests/testcases/backends/import/import_tests.xml | 5
opends/tests/staf-tests/functional-tests/testcases/backends/export/export_tests.xml | 97 ++++++++--------
opends/tests/staf-tests/functional-tests/testcases/backends/export-tasks/export-tasks_tests.xml | 161 +++++++++++++-------------
opends/tests/staf-tests/functional-tests/testcases/backends/restore/restore_tests.xml | 17 +-
opends/tests/staf-tests/functional-tests/testcases/backends/backup/backup_tests.xml | 25 ++--
opends/tests/staf-tests/functional-tests/testcases/backends/backup-tasks/backup-tasks_tests.xml | 11 +
opends/tests/staf-tests/shared/functions/dsadm.xml | 10 +
opends/tests/staf-tests/functional-tests/testcases/backends/import-tasks/import-tasks_tests.xml | 7
9 files changed, 182 insertions(+), 164 deletions(-)
diff --git a/opends/tests/staf-tests/functional-tests/testcases/backends/backup-tasks/backup-tasks_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/backends/backup-tasks/backup-tasks_tests.xml
index 2ce4fe8..63183d2 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/backends/backup-tasks/backup-tasks_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/backends/backup-tasks/backup-tasks_tests.xml
@@ -24,6 +24,7 @@
! CDDL HEADER END
!
! Copyright 2009 Sun Microsystems, Inc.
+ ! Portions Copyright 2011 ForgeRock AS.
! -->
<stax>
<!--- Test Case information
@@ -56,7 +57,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'backupID' : 'scheduled-backup',
'schedulePattern' : '"0 15 * * 1-5"' ,
- 'backupDir' : '%s/backends/' % remote.data ,
+ 'backupDir' : '%s/backends/' % remote.temp ,
'extraParams' : '--completionNotify foo' ,
'expectedRC' : 1
}
@@ -74,7 +75,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'backupID' : 'scheduled-backup',
'schedulePattern' : '"0 15 * * 1-5"' ,
- 'backupDir' : '%s/backends/' % remote.data ,
+ 'backupDir' : '%s/backends/' % remote.temp ,
'extraParams' : '--completionNotify foo@example.com'
}
</call>
@@ -125,7 +126,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'backupID' : 'scheduled-backup-2',
'schedulePattern' : '"0 15 * * 1-5"' ,
- 'backupDir' : '%s/backends/' % remote.data ,
+ 'backupDir' : '%s/backends/' % remote.temp ,
'extraParams' : '--errorNotify foo' ,
'expectedRC' : 1
}
@@ -143,7 +144,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'backupID' : 'scheduled-backup-2',
'schedulePattern' : '"0 15 * * 1-5"' ,
- 'backupDir' : '%s/backends/' % remote.data ,
+ 'backupDir' : '%s/backends/' % remote.temp ,
'extraParams' : '--errorNotify foo@example.com'
}
</call>
@@ -192,7 +193,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'backupID' : 'scheduled-backup-3',
- 'backupDir' : '%s/backends/' % remote.data ,
+ 'backupDir' : '%s/backends/' % remote.temp ,
'extraParams' : '--dependency foo' ,
'expectedRC' : 1
}
diff --git a/opends/tests/staf-tests/functional-tests/testcases/backends/backup/backup_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/backends/backup/backup_tests.xml
index a06033b..bebfc14 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/backends/backup/backup_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/backends/backup/backup_tests.xml
@@ -24,6 +24,7 @@
! CDDL HEADER END
!
! Copyright 2009 Sun Microsystems, Inc.
+ ! Portions Copyright 2011 ForgeRock AS.
! -->
<stax>
<!--- Test Case information
@@ -50,7 +51,7 @@
</message>
<call function="'backup'">
- { 'backupDir' : '%s/backends/backup1' % remote.data }
+ { 'backupDir' : '%s/backends/backup1' % remote.temp }
</call>
</sequence>
@@ -88,7 +89,7 @@
'Backend Backup 002 Create an incremental backup of the data in OpenDS'
</message>
<call function="'backup'">
- { 'backupDir' : '%s/backends/backup1' % remote.data,
+ { 'backupDir' : '%s/backends/backup1' % remote.temp,
'extraParams' : '-i'
}
</call>
@@ -129,7 +130,7 @@
</message>
<call function="'backup'">
- { 'backupDir' : '%s/backends/backup2' % remote.data,
+ { 'backupDir' : '%s/backends/backup2' % remote.temp,
'extraParams' : '-I 20070714142807Z'
}
</call>
@@ -170,7 +171,7 @@
'Backend Backup 004: Create an incremental backup of the data in OpenDS with a backup id'
</message>
<call function="'backup'">
- { 'backupDir' : '%s/backends/backup2' % remote.data,
+ { 'backupDir' : '%s/backends/backup2' % remote.temp,
'extraParams' : '-B 20070714142807Z -i'
}
</call>
@@ -212,7 +213,7 @@
'Backend Backup 005: Create a compressed backup of the data in OpenDS'
</message>
<call function="'backup'">
- { 'backupDir' : '%s/backends/backup1' % remote.data,
+ { 'backupDir' : '%s/backends/backup1' % remote.temp,
'extraParams' : '-c'
}
</call>
@@ -254,7 +255,7 @@
'Backend Backup 006: Create a backup with -n and -a'
</message>
<call function="'backup'">
- { 'backupDir' : '%s/backends/backup1' % remote.data,
+ { 'backupDir' : '%s/backends/backup1' % remote.temp,
'extraParams' : '-n dc=com' ,
'extraParams' : '-a' ,
'expectedRC' : 1
@@ -309,7 +310,7 @@
'Backend Backup 007: Create a backup with -A '
</message>
<call function="'backup'">
- { 'backupDir' : '%s/backends/backup1' % remote.data,
+ { 'backupDir' : '%s/backends/backup1' % remote.temp,
'extraParams' : '-A'
}
</call>
@@ -326,7 +327,7 @@
<!-- restore with -n to validate the archive -->
<call function="'restore'">
- { 'backupDir' : '%s/backends/backup1' % remote.data,
+ { 'backupDir' : '%s/backends/backup1' % remote.temp,
'extraParams' : '-n'
}
</call>
@@ -366,7 +367,7 @@
'Backend Backup 008: Create a backup with a backup id'
</message>
<call function="'backup'">
- { 'backupDir' : '%s/backends/backup2' % remote.data,
+ { 'backupDir' : '%s/backends/backup2' % remote.temp,
'extraParams' : '-I unique-backupid'
}
</call>
@@ -375,7 +376,7 @@
'Backend Backup 008: Create a backup with an existing backup id'
</message>
<call function="'backup'">
- { 'backupDir' : '%s/backends/backup2' % remote.data,
+ { 'backupDir' : '%s/backends/backup2' % remote.temp,
'extraParams' : '-I unique-backupid' ,
'expectedRC' : 1
}
@@ -430,7 +431,7 @@
'Backend Backup 009: Create a backup with -B but without -i '
</message>
<call function="'backup'">
- { 'backupDir' : '%s/backends/backup2' % remote.data,
+ { 'backupDir' : '%s/backends/backup2' % remote.temp,
'extraParams' : '-B 20070714142807Z' ,
'expectedRC' : 1
}
@@ -486,7 +487,7 @@
'Backend Backup 010: Create an incremental backup with a non existing backup dir'
</message>
<call function="'backup'">
- { 'backupDir' : '%s/backends/backup3' % remote.data,
+ { 'backupDir' : '%s/backends/backup3' % remote.temp,
'extraParams' : '-i'
}
</call>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/backends/export-tasks/export-tasks_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/backends/export-tasks/export-tasks_tests.xml
index 24046ba..90da282 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/backends/export-tasks/export-tasks_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/backends/export-tasks/export-tasks_tests.xml
@@ -24,6 +24,7 @@
! CDDL HEADER END
!
! Copyright 2009-2010 Sun Microsystems, Inc.
+ ! Portions Copyright 2011 ForgeRock AS.
! -->
<stax>
@@ -200,7 +201,7 @@
'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'ldifFile' : '%s/backends/ExportTasks1.ldif' % remote.data
+ 'ldifFile' : '%s/backends/ExportTasks1.ldif' % remote.temp
}
</call>
@@ -210,8 +211,8 @@
<call function="'LdifDiffWithScript'">
{
'sourceLdif' : '%s/backends/export_tasks_ldif/defaultBackEnd.ref' % remote.data,
- 'targetLdif' : '%s/backends/ExportTasks1.ldif' % remote.data,
- 'outputLdif' : '%s/ExportTasks1.out' % remote.temp
+ 'targetLdif' : '%s/backends/ExportTasks1.ldif' % remote.temp,
+ 'outputLdif' : '%s/backends/ExportTasks1.out' % remote.temp
}
</call>
@@ -264,7 +265,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'backEnd' : 'nonDefault',
'excludeAttributes' : ["userPassword"],
- 'ldifFile' : '%s/backends/ExportTasks2.ldif' % remote.data
+ 'ldifFile' : '%s/backends/ExportTasks2.ldif' % remote.temp
}
</call>
@@ -274,8 +275,8 @@
<call function="'LdifDiffWithScript'">
{
'sourceLdif' : '%s/backends/export_tasks_ldif/nonDefaultBackEnd.ref' % remote.data,
- 'targetLdif' : '%s/backends/ExportTasks2.ldif' % remote.data,
- 'outputLdif' : '%s/ExportTasks2.out' % remote.temp
+ 'targetLdif' : '%s/backends/ExportTasks2.ldif' % remote.temp,
+ 'outputLdif' : '%s/backends/ExportTasks2.out' % remote.temp
}
</call>
@@ -327,7 +328,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'includeBranches' : ["ou=people,dc=example,dc=com"],
- 'ldifFile' : '%s/backends/ExportTasks3.ldif' % remote.data
+ 'ldifFile' : '%s/backends/ExportTasks3.ldif' % remote.temp
}
</call>
<message>
@@ -335,9 +336,9 @@
</message>
<call function="'LdifDiffWithScript'">
{
- 'sourceLdif' : '%s/backends/ExportTasks3.ldif' % remote.data,
- 'targetLdif' : '%s/backends/export_tasks_ldif/Include_Branch.ref' % remote.data,
- 'outputLdif' : '%s/ExportTasks3.out' % remote.temp
+ 'sourceLdif' : '%s/backends/export_tasks_ldif/Include_Branch.ref' % remote.data,
+ 'targetLdif' : '%s/backends/ExportTasks3.ldif' % remote.temp,
+ 'outputLdif' : '%s/backends/ExportTasks3.out' % remote.temp
}
</call>
@@ -392,7 +393,7 @@
'includeBranches' : ["cn=Directory Administrators,ou=Groups,dc=example,dc=com",
"cn=HR Managers,ou=Groups,dc=example,dc=com",
"cn=Accounting Managers,ou=Groups,dc=example,dc=com"],
- 'ldifFile' : '%s/backends/ExportTasks4.ldif' % remote.data
+ 'ldifFile' : '%s/backends/ExportTasks4.ldif' % remote.temp
}
</call>
<message>
@@ -400,9 +401,9 @@
</message>
<call function="'LdifDiffWithScript'">
{
- 'sourceLdif' : '%s/backends/ExportTasks4.ldif' % remote.data,
- 'targetLdif' : '%s/backends/export_tasks_ldif/Multiple_Include_Branch.ref' % remote.data,
- 'outputLdif' : '%s/ExportTasks4.out' % remote.temp
+ 'sourceLdif' : '%s/backends/export_tasks_ldif/Multiple_Include_Branch.ref' % remote.data,
+ 'targetLdif' : '%s/backends/ExportTasks4.ldif' % remote.temp,
+ 'outputLdif' : '%s/backends/ExportTasks4.out' % remote.temp
}
</call>
@@ -453,7 +454,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'excludeBranches' : ["ou=Groups,dc=example,dc=com"],
- 'ldifFile' : '%s/backends/ExportTasks5.ldif' % remote.data
+ 'ldifFile' : '%s/backends/ExportTasks5.ldif' % remote.temp
}
</call>
<message>
@@ -461,9 +462,9 @@
</message>
<call function="'LdifDiffWithScript'">
{
- 'sourceLdif' : '%s/backends/ExportTasks5.ldif' % remote.data,
- 'targetLdif' : '%s/backends/export_tasks_ldif/Exclude_Branch.ref' % remote.data,
- 'outputLdif' : '%s/ExportTasks5.out' % remote.temp
+ 'sourceLdif' : '%s/backends/export_tasks_ldif/Exclude_Branch.ref' % remote.data,
+ 'targetLdif' : '%s/backends/ExportTasks5.ldif' % remote.temp,
+ 'outputLdif' : '%s/backends/ExportTasks5.out' % remote.temp
}
</call>
@@ -518,7 +519,7 @@
'excludeBranches' : ["cn=Directory Administrators,ou=Groups,dc=example,dc=com",
"cn=HR Managers,ou=Groups,dc=example,dc=com",
"cn=Accounting Managers,ou=Groups,dc=example,dc=com"],
- 'ldifFile' : '%s/backends/ExportTasks6.ldif' % remote.data
+ 'ldifFile' : '%s/backends/ExportTasks6.ldif' % remote.temp
}
</call>
<message>
@@ -526,9 +527,9 @@
</message>
<call function="'LdifDiffWithScript'">
{
- 'sourceLdif' : '%s/backends/ExportTasks6.ldif' % remote.data,
- 'targetLdif' : '%s/backends/export_tasks_ldif/Multiple_Exclude_Branch.ref' % remote.data,
- 'outputLdif' : '%s/ExportTasks6.out' % remote.temp
+ 'sourceLdif' : '%s/backends/export_tasks_ldif/Multiple_Exclude_Branch.ref' % remote.data,
+ 'targetLdif' : '%s/backends/ExportTasks6.ldif' % remote.temp,
+ 'outputLdif' : '%s/backends/ExportTasks6.out' % remote.temp
}
</call>
@@ -582,17 +583,17 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'includeBranches' : ["ou=Groups,dc=example,dc=com"],
'excludeBranches' : ["cn=Accounting Managers,ou=Groups,dc=example,dc=com"],
- 'ldifFile' : '%s/backends/ExportTasks7.ldif' % remote.data
+ 'ldifFile' : '%s/backends/ExportTasks7.ldif' % remote.temp
}
</call>
<message>
- 'Backend ExportTasks6: Check no diff'
+ 'Backend ExportTasks7: Check no diff'
</message>
<call function="'LdifDiffWithScript'">
{
- 'sourceLdif' : '%s/backends/ExportTasks7.ldif' % remote.data,
- 'targetLdif' : '%s/backends/export_tasks_ldif/Mix_Include_Exclude_Branch.ref' % remote.data,
- 'outputLdif' : '%s/ExportTasks7.out' % remote.temp
+ 'sourceLdif' : '%s/backends/export_tasks_ldif/Mix_Include_Exclude_Branch.ref' % remote.data,
+ 'targetLdif' : '%s/backends/ExportTasks7.ldif' % remote.temp,
+ 'outputLdif' : '%s/backends/ExportTasks7.out' % remote.temp
}
</call>
@@ -643,7 +644,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'includeAttributes' : ["dn"],
- 'ldifFile' : '%s/backends/ExportTasks8.ldif' % remote.data
+ 'ldifFile' : '%s/backends/ExportTasks8.ldif' % remote.temp
}
</call>
<message>
@@ -651,9 +652,9 @@
</message>
<call function="'LdifDiffWithScript'">
{
- 'sourceLdif' : '%s/backends/ExportTasks8.ldif' % remote.data,
- 'targetLdif' : '%s/backends/export_tasks_ldif/Include_Attribute.ref' % remote.data,
- 'outputLdif' : '%s/ExportTasks8.out' % remote.temp
+ 'sourceLdif' : '%s/backends/export_tasks_ldif/Include_Attribute.ref' % remote.data,
+ 'targetLdif' : '%s/backends/ExportTasks8.ldif' % remote.temp,
+ 'outputLdif' : '%s/backends/ExportTasks8.out' % remote.temp
}
</call>
@@ -705,7 +706,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'includeAttributes' : ["mail","givenName"],
- 'ldifFile' : '%s/backends/ExportTasks9.ldif' % remote.data
+ 'ldifFile' : '%s/backends/ExportTasks9.ldif' % remote.temp
}
</call>
<message>
@@ -713,9 +714,9 @@
</message>
<call function="'LdifDiffWithScript'">
{
- 'sourceLdif' : '%s/backends/ExportTasks9.ldif' % remote.data,
- 'targetLdif' : '%s/backends/export_tasks_ldif/Multiple_Include_Attribute.ref' % remote.data,
- 'outputLdif' : '%s/ExportTasks9.out' % remote.temp
+ 'sourceLdif' : '%s/backends/export_tasks_ldif/Multiple_Include_Attribute.ref' % remote.data,
+ 'targetLdif' : '%s/backends/ExportTasks9.ldif' % remote.temp,
+ 'outputLdif' : '%s/backends/ExportTasks9.out' % remote.temp
}
</call>
@@ -766,7 +767,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'excludeAttributes' : ["givenName"],
- 'ldifFile' : '%s/backends/ExportTasks10.ldif' % remote.data
+ 'ldifFile' : '%s/backends/ExportTasks10.ldif' % remote.temp
}
</call>
<message>
@@ -774,9 +775,9 @@
</message>
<call function="'LdifDiffWithScript'">
{
- 'sourceLdif' : '%s/backends/ExportTasks10.ldif' % remote.data,
- 'targetLdif' : '%s/backends/export_tasks_ldif/Exclude_Attribute.ref' % remote.data,
- 'outputLdif' : '%s/ExportTasks10.out' % remote.temp
+ 'sourceLdif' : '%s/backends/export_tasks_ldif/Exclude_Attribute.ref' % remote.data,
+ 'targetLdif' : '%s/backends/ExportTasks10.ldif' % remote.temp,
+ 'outputLdif' : '%s/backends/ExportTasks10.out' % remote.temp
}
</call>
@@ -828,7 +829,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'excludeAttributes' : ["cn","telephoneNumber"],
- 'ldifFile' : '%s/backends/ExportTasks11.ldif' % remote.data
+ 'ldifFile' : '%s/backends/ExportTasks11.ldif' % remote.temp
}
</call>
<message>
@@ -836,9 +837,9 @@
</message>
<call function="'LdifDiffWithScript'">
{
- 'sourceLdif' : '%s/backends/ExportTasks11.ldif' % remote.data,
- 'targetLdif' : '%s/backends/export_tasks_ldif/Multiple_Exclude_Attribute.ref' % remote.data,
- 'outputLdif' : '%s/ExportTasks11.out' % remote.temp
+ 'sourceLdif' : '%s/backends/export_tasks_ldif/Multiple_Exclude_Attribute.ref' % remote.data,
+ 'targetLdif' : '%s/backends/ExportTasks11.ldif' % remote.temp,
+ 'outputLdif' : '%s/backends/ExportTasks11.out' % remote.temp
}
</call>
@@ -891,7 +892,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'includeBranches' : ["ou=People,dc=example,dc=com"],
'includeAttributes' : ["givenName"],
- 'ldifFile' : '%s/backends/ExportTasks12.ldif' % remote.data
+ 'ldifFile' : '%s/backends/ExportTasks12.ldif' % remote.temp
}
</call>
<message>
@@ -899,9 +900,9 @@
</message>
<call function="'LdifDiffWithScript'">
{
- 'sourceLdif' : '%s/backends/ExportTasks12.ldif' % remote.data,
- 'targetLdif' : '%s/backends/export_tasks_ldif/Mix_IncludeBranch_IncludeAttribute.ref' % remote.data,
- 'outputLdif' : '%s/ExportTasks7.out' % remote.temp
+ 'sourceLdif' : '%s/backends/export_tasks_ldif/Mix_IncludeBranch_IncludeAttribute.ref' % remote.data,
+ 'targetLdif' : '%s/backends/ExportTasks12.ldif' % remote.temp,
+ 'outputLdif' : '%s/backends/ExportTasks12.out' % remote.temp
}
</call>
@@ -954,7 +955,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'includeFilters' : ["l=Santa Clara"],
- 'ldifFile' : '%s/backends/ExportTasks13.ldif' % remote.data
+ 'ldifFile' : '%s/backends/ExportTasks13.ldif' % remote.temp
}
</call>
<message>
@@ -962,9 +963,9 @@
</message>
<call function="'LdifDiffWithScript'">
{
- 'sourceLdif' : '%s/backends/ExportTasks13.ldif' % remote.data,
- 'targetLdif' : '%s/backends/export_tasks_ldif/Filtered_Include.ref' % remote.data,
- 'outputLdif' : '%s/ExportTasks13.out' % remote.temp
+ 'sourceLdif' : '%s/backends/export_tasks_ldif/Filtered_Include.ref' % remote.data,
+ 'targetLdif' : '%s/backends/ExportTasks13.ldif' % remote.temp,
+ 'outputLdif' : '%s/backends/ExportTasks13.out' % remote.temp
}
</call>
@@ -1016,7 +1017,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'includeFilters' : ["l=Santa Clara","ou=Accounting"],
- 'ldifFile' : '%s/backends/ExportTasks14.ldif' % remote.data
+ 'ldifFile' : '%s/backends/ExportTasks14.ldif' % remote.temp
}
</call>
<message>
@@ -1024,9 +1025,9 @@
</message>
<call function="'LdifDiffWithScript'">
{
- 'sourceLdif' : '%s/backends/ExportTasks14.ldif' % remote.data,
- 'targetLdif' : '%s/backends/export_tasks_ldif/Filtered_Includes.ref' % remote.data,
- 'outputLdif' : '%s/ExportTasks14.out' % remote.temp
+ 'sourceLdif' : '%s/backends/export_tasks_ldif/Filtered_Includes.ref' % remote.data,
+ 'targetLdif' : '%s/backends/ExportTasks14.ldif' % remote.temp,
+ 'outputLdif' : '%s/backends/ExportTasks14.out' % remote.temp
}
</call>
@@ -1078,7 +1079,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'excludeFilters' : ["uid=a*","l=Sunnyvale"],
- 'ldifFile' : '%s/backends/ExportTasks15.ldif' % remote.data
+ 'ldifFile' : '%s/backends/ExportTasks15.ldif' % remote.temp
}
</call>
<message>
@@ -1086,9 +1087,9 @@
</message>
<call function="'LdifDiffWithScript'">
{
- 'sourceLdif' : '%s/backends/ExportTasks15.ldif' % remote.data,
- 'targetLdif' : '%s/backends/export_tasks_ldif/Filtered_Excludes.ref' % remote.data,
- 'outputLdif' : '%s/ExportTasks15.out' % remote.temp
+ 'sourceLdif' : '%s/backends/export_tasks_ldif/Filtered_Excludes.ref' % remote.data,
+ 'targetLdif' : '%s/backends/ExportTasks15.ldif' % remote.temp,
+ 'outputLdif' : '%s/backends/ExportTasks15.out' % remote.temp
}
</call>
@@ -1142,7 +1143,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'excludeFilters' : ["&(ou=Human Resources)(l=SunnyVale)"],
- 'ldifFile' : '%s/backends/ExportTasks16.ldif' % remote.data
+ 'ldifFile' : '%s/backends/ExportTasks16.ldif' % remote.temp
}
</call>
<message>
@@ -1150,9 +1151,9 @@
</message>
<call function="'LdifDiffWithScript'">
{
- 'sourceLdif' : '%s/backends/ExportTasks16.ldif' % remote.data,
- 'targetLdif' : '%s/backends/export_tasks_ldif/Complex_Filter_Exclude.ref' % remote.data,
- 'outputLdif' : '%s/ExportTasks16.out' % remote.temp
+ 'sourceLdif' : '%s/backends/export_tasks_ldif/Complex_Filter_Exclude.ref' % remote.data,
+ 'targetLdif' : '%s/backends/ExportTasks16.ldif' % remote.temp,
+ 'outputLdif' : '%s/backends/ExportTasks16.out' % remote.temp
}
</call>
@@ -1196,7 +1197,7 @@
<call function="'testCase_Preamble'"/>
<message>
- 'Backend ExportTasks15: Export the data by scheduling a task and include branch ou=People,dc=example,dc=com \
+ 'Backend ExportTasks17: Export the data by scheduling a task and include branch ou=People,dc=example,dc=com \
and exclude filter l=Stanta Clara'
</message>
@@ -1208,17 +1209,17 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'includeBranches' : ["ou=people,dc=example,dc=com"],
'excludeFilters' : ["l=Santa Clara"],
- 'ldifFile' : '%s/backends/ExportTasks17.ldif' % remote.data
+ 'ldifFile' : '%s/backends/ExportTasks17.ldif' % remote.temp
}
</call>
<message>
- 'Backend ExportTasks15: Check no diff'
+ 'Backend ExportTasks17: Check no diff'
</message>
<call function="'LdifDiffWithScript'">
{
- 'sourceLdif' : '%s/backends/ExportTasks17.ldif' % remote.data,
- 'targetLdif' : '%s/backends/export_tasks_ldif/Mix_Fractional_Filtered.ref' % remote.data,
- 'outputLdif' : '%s/ExportTasks17.out' % remote.temp
+ 'sourceLdif' : '%s/backends/export_tasks_ldif/Mix_Fractional_Filtered.ref' % remote.data,
+ 'targetLdif' : '%s/backends/ExportTasks17.ldif' % remote.temp,
+ 'outputLdif' : '%s/backends/ExportTasks17.out' % remote.temp
}
</call>
@@ -1272,7 +1273,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'includeBranches' : ["ou=people,dc=example,dc=com"],
- 'ldifFile' : '%s/backends/ExportTasks18.ldif' % remote.data
+ 'ldifFile' : '%s/backends/ExportTasks18.ldif' % remote.temp
}
</call>
@@ -1287,7 +1288,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'includeBranches' : ["cn=QA Managers,ou=Groups,dc=example,dc=com"],
- 'ldifFile' : '%s/backends/ExportTasks18.ldif' % remote.data,
+ 'ldifFile' : '%s/backends/ExportTasks18.ldif' % remote.temp,
'append' : 'True'
}
</call>
@@ -1297,9 +1298,9 @@
</message>
<call function="'LdifDiffWithScript'">
{
- 'sourceLdif' : '%s/backends/ExportTasks18.ldif' % remote.data,
- 'targetLdif' : '%s/backends/export_tasks_ldif/Append.ref' % remote.data,
- 'outputLdif' : '%s/ExportTasks18.out' % remote.temp
+ 'sourceLdif' : '%s/backends/export_tasks_ldif/Append.ref' % remote.data,
+ 'targetLdif' : '%s/backends/ExportTasks18.ldif' % remote.temp,
+ 'outputLdif' : '%s/backends/ExportTasks18.out' % remote.temp
}
</call>
@@ -1356,7 +1357,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'includeBranches' : ["ou=people,dc=example,dc=com"],
'isCompressed' : 'True',
- 'ldifFile' : '%s/backends/ExportTasks19.ldif.gz' % remote.data
+ 'ldifFile' : '%s/backends/ExportTasks19.ldif.gz' % remote.temp
}
</call>
@@ -1400,7 +1401,7 @@
<call function="'ImportLdifWithScript'">
{
- 'ldifFile' : '%s/backends/ExportTasks19.ldif.gz' % remote.data,
+ 'ldifFile' : '%s/backends/ExportTasks19.ldif.gz' % remote.temp,
'backEnd' : DIRECTORY_INSTANCE_BE,
'append' : ' ',
'isCompressed' : 'True'
@@ -1498,7 +1499,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'includeBranches' : ["ou=Groups,dc=example,dc=com"],
'wrapColumn' : 30,
- 'ldifFile' : '%s/backends/ExportTasks20.ldif' % remote.data
+ 'ldifFile' : '%s/backends/ExportTasks20.ldif' % remote.temp
}
</call>
@@ -1508,9 +1509,9 @@
<call function="'LdifDiffWithScript'">
{
- 'sourceLdif' : '%s/backends/ExportTasks20.ldif' % remote.data,
- 'targetLdif' : '%s/backends/export_tasks_ldif/Include_Branch_Wrap.ref' % remote.data,
- 'outputLdif' : '%s/ExportTasks20.out' % remote.temp
+ 'sourceLdif' : '%s/backends/export_tasks_ldif/Include_Branch_Wrap.ref' % remote.data,
+ 'targetLdif' : '%s/backends/ExportTasks20.ldif' % remote.temp,
+ 'outputLdif' : '%s/backends/ExportTasks20.out' % remote.temp
}
</call>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/backends/export/export_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/backends/export/export_tests.xml
index 77eebd4..44fa42f 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/backends/export/export_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/backends/export/export_tests.xml
@@ -24,6 +24,7 @@
! CDDL HEADER END
!
! Copyright 2009-2010 Sun Microsystems, Inc.
+ ! Portions Copyright 2011 ForgeRock AS.
! -->
<stax>
@@ -141,13 +142,13 @@
</message>
<call function="'exportLdifWithScript'">
{
- 'ldifFile' : '%s/backends/Export_default.ldif' % remote.data,
+ 'ldifFile' : '%s/backends/Export_default.ldif' % remote.temp,
'backEnd' : '%s' % DIRECTORY_INSTANCE_BE
}
</call>
<call function="'ImportLdifWithScript'">
- { 'ldifFile' : '%s/backends/Export_default.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/Export_default.ldif' % remote.temp,
'backEnd' : DIRECTORY_INSTANCE_BE ,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
}
@@ -257,13 +258,13 @@
<call function="'StopDsWithScript'"/>
<call function="'exportLdifWithScript'">
- { 'ldifFile' : '%s/backends/Export_nonDefault.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/Export_nonDefault.ldif' % remote.temp,
'backEnd' : 'nonDefault'
}
</call>
<call function="'ImportLdifWithScript'">
- { 'ldifFile' : '%s/backends/Export_nonDefault.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/Export_nonDefault.ldif' % remote.temp,
'backEnd' : 'nonDefault' ,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
}
@@ -338,13 +339,13 @@
'Backend: Export: Export Fractional Include Branch'
</message>
<call function="'exportLdifWithScript'">
- { 'ldifFile' : '%s/backends/Export_IncludeBranch.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/Export_IncludeBranch.ldif' % remote.temp,
'includeBranches' : ["dc=com"]
}
</call>
<call function="'ImportLdifWithScript'">
- { 'ldifFile' : '%s/backends/Export_IncludeBranch.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/Export_IncludeBranch.ldif' % remote.temp,
'backEnd' : DIRECTORY_INSTANCE_BE ,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
}
@@ -419,13 +420,13 @@
</message>
<call function="'exportLdifWithScript'">
{
- 'ldifFile' : '%s/backends/Export_IncludeBranches.ldif' % remote.data,
+ 'ldifFile' : '%s/backends/Export_IncludeBranches.ldif' % remote.temp,
'includeBranches': ["dc=com","dc=example,dc=com"]
}
</call>
<call function="'ImportLdifWithScript'">
- { 'ldifFile' : '%s/backends/Export_IncludeBranches.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/Export_IncludeBranches.ldif' % remote.temp,
'backEnd' : DIRECTORY_INSTANCE_BE ,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
}
@@ -500,13 +501,13 @@
'Backend: Export: Export Fractional Exclude Branch'
</message>
<call function="'exportLdifWithScript'">
- { 'ldifFile' : '%s/backends/Export_ExcludeBranch.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/Export_ExcludeBranch.ldif' % remote.temp,
'excludeBranches' : ["dc=example,dc=com"]
}
</call>
<call function="'ImportLdifWithScript'">
- { 'ldifFile' : '%s/backends/Export_ExcludeBranch.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/Export_ExcludeBranch.ldif' % remote.temp,
'backEnd' : DIRECTORY_INSTANCE_BE ,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
}
@@ -581,13 +582,13 @@
'Backend: Export: Export Fractional Exclude Branches'
</message>
<call function="'exportLdifWithScript'">
- { 'ldifFile' : '%s/backends/Export_ExcludeBranches.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/Export_ExcludeBranches.ldif' % remote.temp,
'excludeBranches' : ["ou=People,dc=example,dc=com","dc=example,dc=com"]
}
</call>
<call function="'ImportLdifWithScript'">
- { 'ldifFile' : '%s/backends/Export_ExcludeBranches.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/Export_ExcludeBranches.ldif' % remote.temp,
'backEnd' : DIRECTORY_INSTANCE_BE ,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
}
@@ -661,14 +662,14 @@
'Backend: Export: Export Fractional Branches Mix'
</message>
<call function="'exportLdifWithScript'">
- { 'ldifFile' : '%s/backends/Export_MixBranches.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/Export_MixBranches.ldif' % remote.temp,
'includeBranches' : ["dc=com"],
'excludeBranches' : ["ou=People,dc=example,dc=com"]
}
</call>
<call function="'ImportLdifWithScript'">
- { 'ldifFile' : '%s/backends/Export_MixBranches.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/Export_MixBranches.ldif' % remote.temp,
'backEnd' : DIRECTORY_INSTANCE_BE ,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
}
@@ -741,13 +742,13 @@
'Backend: Export: Export Fractional Include Attribute'
</message>
<call function="'exportLdifWithScript'">
- { 'ldifFile' : '%s/backends/Export_IncludeAttr.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/Export_IncludeAttr.ldif' % remote.temp,
'includeAttributes' : ["dc"]
}
</call>
<call function="'ImportLdifWithScript'">
- { 'ldifFile' : '%s/backends/Export_IncludeAttr.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/Export_IncludeAttr.ldif' % remote.temp,
'backEnd' : DIRECTORY_INSTANCE_BE ,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
}
@@ -819,13 +820,13 @@
'Backend: Export: Export Fractional Include Attributes'
</message>
<call function="'exportLdifWithScript'">
- { 'ldifFile' : '%s/backends/Export_IncludeAttrs.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/Export_IncludeAttrs.ldif' % remote.temp,
'includeAttributes' : ["dc","cn","ou","sn","uid"]
}
</call>
<call function="'ImportLdifWithScript'">
- { 'ldifFile' : '%s/backends/Export_IncludeAttrs.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/Export_IncludeAttrs.ldif' % remote.temp,
'backEnd' : DIRECTORY_INSTANCE_BE ,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
}
@@ -900,13 +901,13 @@
'Backend: Export: Export Fractional Exclude Attribute'
</message>
<call function="'exportLdifWithScript'">
- { 'ldifFile' : '%s/backends/Export_ExcludeAttr.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/Export_ExcludeAttr.ldif' % remote.temp,
'excludeAttributes' : ["userPassword"]
}
</call>
<call function="'ImportLdifWithScript'">
- { 'ldifFile' : '%s/backends/Export_ExcludeAttr.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/Export_ExcludeAttr.ldif' % remote.temp,
'backEnd' : DIRECTORY_INSTANCE_BE ,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
}
@@ -979,13 +980,13 @@
'Backend: Export: Export Fractional Exclude Attributes'
</message>
<call function="'exportLdifWithScript'">
- { 'ldifFile' : '%s/backends/Export_ExcludeAttrs.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/Export_ExcludeAttrs.ldif' % remote.temp,
'excludeAttributes' : ["userPassword","mail","roomnumber"]
}
</call>
<call function="'ImportLdifWithScript'">
- { 'ldifFile' : '%s/backends/Export_ExcludeAttrs.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/Export_ExcludeAttrs.ldif' % remote.temp,
'backEnd' : DIRECTORY_INSTANCE_BE ,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
}
@@ -1060,7 +1061,7 @@
'Backend: Export: Export Fractional Mix'
</message>
<call function="'exportLdifWithScript'">
- { 'ldifFile' : '%s/backends/Export_FractionalMix.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/Export_FractionalMix.ldif' % remote.temp,
'includeAttributes' : ["dc","cn","ou","sn","uid"],
'includeBranches' : ["dc=com","dc=example,dc=com","ou=People,dc=example,dc=com"],
'excludeBranches' : ["ou=Departed,ou=People,dc=example,dc=com"]
@@ -1068,7 +1069,7 @@
</call>
<call function="'ImportLdifWithScript'">
- { 'ldifFile' : '%s/backends/Export_FractionalMix.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/Export_FractionalMix.ldif' % remote.temp,
'backEnd' : DIRECTORY_INSTANCE_BE ,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
}
@@ -1143,13 +1144,13 @@
'Backend: Export: Export Filtered Include'
</message>
<call function="'exportLdifWithScript'">
- { 'ldifFile' : '%s/backends/Export_FilteredInclude.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/Export_FilteredInclude.ldif' % remote.temp,
'includeFilters' : ["objectclass=*"]
}
</call>
<call function="'ImportLdifWithScript'">
- { 'ldifFile' : '%s/backends/Export_FilteredInclude.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/Export_FilteredInclude.ldif' % remote.temp,
'backEnd' : DIRECTORY_INSTANCE_BE ,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
}
@@ -1223,13 +1224,13 @@
'Backend: Export: Export Filtered Includes'
</message>
<call function="'exportLdifWithScript'">
- { 'ldifFile' : '%s/backends/Export_FilteredIncludes.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/Export_FilteredIncludes.ldif' % remote.temp,
'includeFilters' : ["objectclass=domain","objectclass=organizationalunit"]
}
</call>
<call function="'ImportLdifWithScript'">
- { 'ldifFile' : '%s/backends/Export_FilteredIncludes.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/Export_FilteredIncludes.ldif' % remote.temp,
'backEnd' : DIRECTORY_INSTANCE_BE ,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
}
@@ -1303,13 +1304,13 @@
'Backend: Export: Export Filtered Exclude'
</message>
<call function="'exportLdifWithScript'">
- { 'ldifFile' : '%s/backends/Export_FilteredExclude.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/Export_FilteredExclude.ldif' % remote.temp,
'excludeFilters' : ["objectclass=person"]
}
</call>
<call function="'ImportLdifWithScript'">
- { 'ldifFile' : '%s/backends/Export_FilteredExclude.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/Export_FilteredExclude.ldif' % remote.temp,
'backEnd' : DIRECTORY_INSTANCE_BE ,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
}
@@ -1385,13 +1386,13 @@
'Backend: Export: Export Filtered Excludes'
</message>
<call function="'exportLdifWithScript'">
- { 'ldifFile' : '%s/backends/Export_FilteredExcludes.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/Export_FilteredExcludes.ldif' % remote.temp,
'excludeFilters' : ["objectclass=person","objectclass=organizationalunit"]
}
</call>
<call function="'ImportLdifWithScript'">
- { 'ldifFile' : '%s/backends/Export_FilteredExcludes.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/Export_FilteredExcludes.ldif' % remote.temp,
'backEnd' : DIRECTORY_INSTANCE_BE ,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
}
@@ -1468,13 +1469,13 @@
</message>
<call function="'exportLdifWithScript'">
{
- 'ldifFile' : '%s/backends/Export_FilteredIncludes.ldif' % remote.data,
+ 'ldifFile' : '%s/backends/Export_FilteredIncludes.ldif' % remote.temp,
'includeFilters' : [ "objectclass=domain", "objectclass=organizationalunit"]
}
</call>
<call function="'ImportLdifWithScript'">
- { 'ldifFile' : '%s/backends/Export_FilteredIncludes.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/Export_FilteredIncludes.ldif' % remote.temp,
'backEnd' : DIRECTORY_INSTANCE_BE ,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
}
@@ -1549,13 +1550,13 @@
'Backend: Export: Export Filtered Includes Complex'
</message>
<call function="'exportLdifWithScript'">
- { 'ldifFile' : '%s/backends/Export_FilteredComplexIncludes.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/Export_FilteredComplexIncludes.ldif' % remote.temp,
'includeFilters' : ["|(objectclass=person)(objectclass=domain)(objectclass=organizationalunit)"]
}
</call>
<call function="'ImportLdifWithScript'">
- { 'ldifFile' : '%s/backends/Export_FilteredComplexIncludes.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/Export_FilteredComplexIncludes.ldif' % remote.temp,
'backEnd' : DIRECTORY_INSTANCE_BE ,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
}
@@ -1629,13 +1630,13 @@
'Backend: Export: Export Filtered Excludes Complex'
</message>
<call function="'exportLdifWithScript'">
- { 'ldifFile' : '%s/backends/Export_FilteredComplexExcludes.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/Export_FilteredComplexExcludes.ldif' % remote.temp,
'excludeFilters' : ["&(objectclass=person)(ou=Departed)"]
}
</call>
<call function="'ImportLdifWithScript'">
- { 'ldifFile' : '%s/backends/Export_FilteredComplexExcludes.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/Export_FilteredComplexExcludes.ldif' % remote.temp,
'backEnd' : DIRECTORY_INSTANCE_BE ,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
}
@@ -1709,7 +1710,7 @@
'Backend: Export: Export Fractional Filtered Mix'
</message>
<call function="'exportLdifWithScript'">
- { 'ldifFile' : '%s/backends/Export_FilteredMix.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/Export_FilteredMix.ldif' % remote.temp,
'excludeFilters' : ["&(objectclass=person)(ou=Departed)"],
'includeBranches' : ["dc=com"],
'excludeAttributes' : ["userpassword"]
@@ -1717,7 +1718,7 @@
</call>
<call function="'ImportLdifWithScript'">
- { 'ldifFile' : '%s/backends/Export_FilteredMix.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/Export_FilteredMix.ldif' % remote.temp,
'backEnd' : DIRECTORY_INSTANCE_BE ,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
}
@@ -1791,13 +1792,13 @@
'Backend: Export: Export Append To LDIF'
</message>
<call function="'exportLdifWithScript'">
- { 'ldifFile' : '%s/backends/Export_FilteredMix.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/Export_FilteredMix.ldif' % remote.temp,
'append' : 'True'
}
</call>
<call function="'ImportLdifWithScript'">
- { 'ldifFile' : '%s/backends/Export_FilteredMix.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/Export_FilteredMix.ldif' % remote.temp,
'append' : 'True' ,
'backEnd' : DIRECTORY_INSTANCE_BE ,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
@@ -1872,13 +1873,13 @@
'Backend: Export: Export Compress LDIF'
</message>
<call function="'exportLdifWithScript'">
- { 'ldifFile' : '%s/backends/ExportCompressed.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/ExportCompressed.ldif' % remote.temp,
'isCompressed' : 'True'
}
</call>
<call function="'ImportLdifWithScript'">
- { 'ldifFile' : '%s/backends/ExportCompressed.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/ExportCompressed.ldif' % remote.temp,
'isCompressed' : 'True' ,
'backEnd' : DIRECTORY_INSTANCE_BE ,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
@@ -1953,13 +1954,13 @@
'Backend: Export: Export Encrypt LDIF'
</message>
<call function="'exportLdifWithScript'">
- { 'ldifFile' : '%s/backends/ExportEncrypted.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/ExportEncrypted.ldif' % remote.temp,
'isEncrypted' : 'True'
}
</call>
<call function="'ImportLdifWithScript'">
- { 'ldifFile' : '%s/backends/ExportEncrypted.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/ExportEncrypted.ldif' % remote.temp,
'isEncrypted' : 'True' ,
'backEnd' : DIRECTORY_INSTANCE_BE ,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
@@ -2077,13 +2078,13 @@
'Backend: Export: Export Wrap Column'
</message>
<call function="'exportLdifWithScript'">
- { 'ldifFile' : '%s/backends/ExportWrapCol.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/ExportWrapCol.ldif' % remote.temp,
'wrapColumn' : 25,
}
</call>
<call function="'ImportLdifWithScript'">
- { 'ldifFile' : '%s/backends/ExportWrapCol.ldif' % remote.data,
+ { 'ldifFile' : '%s/backends/ExportWrapCol.ldif' % remote.temp,
'backEnd' : DIRECTORY_INSTANCE_BE ,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME)
}
diff --git a/opends/tests/staf-tests/functional-tests/testcases/backends/import-tasks/import-tasks_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/backends/import-tasks/import-tasks_tests.xml
index 903a042..c03c00f 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/backends/import-tasks/import-tasks_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/backends/import-tasks/import-tasks_tests.xml
@@ -24,6 +24,7 @@
! CDDL HEADER END
!
! Copyright 2009-2010 Sun Microsystems, Inc.
+ ! Portions Copyright 2011 ForgeRock AS.
! -->
<stax>
@@ -1497,7 +1498,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'ldifFile' : '%s/backends/Example.ldif' % remote.data,
- 'rejectFile' : './rejects'
+ 'rejectFile' : '%s/backends/import_tasks_025-rejects.txt' % remote.temp
}
</call>
@@ -1555,8 +1556,8 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'ldifFile' : '%s/backends/Example.ldif' % remote.data,
- 'rejectFile' : './rejects',
- 'overwriteFile' : 'TRUE'
+ 'rejectFile' : '%s/backends/import_tasks_026-rejects.txt' % remote.temp,
+ 'overwriteFile' : 'TRUE'
}
</call>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/backends/import/import_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/backends/import/import_tests.xml
index e9c3420..a10c107 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/backends/import/import_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/backends/import/import_tests.xml
@@ -24,6 +24,7 @@
! CDDL HEADER END
!
! Copyright 2009-2010 Sun Microsystems, Inc.
+ ! Portions Copyright 2011 ForgeRock AS.
! -->
<stax>
@@ -1438,7 +1439,7 @@
<call function="'ImportLdifWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
'ldifFile' : '%s/backends/Example.ldif' % remote.data,
- 'rejectFile' : '%s/rejects.txt' % remote.temp,
+ 'rejectFile' : '%s/backends/import_026-rejects.txt' % remote.temp,
'backEnd' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -1491,7 +1492,7 @@
<call function="'ImportLdifWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
'ldifFile' : '%s/backends/Example.ldif' % remote.data,
- 'rejectFile' : '%s/rejects.txt' % remote.temp,
+ 'rejectFile' : '%s/backends/import_027-rejects.txt' % remote.temp,
'backEnd' : DIRECTORY_INSTANCE_BE
}
</call>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/backends/restore-tasks/restore-tasks_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/backends/restore-tasks/restore-tasks_tests.xml
index 3b7f272..de6270d 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/backends/restore-tasks/restore-tasks_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/backends/restore-tasks/restore-tasks_tests.xml
@@ -24,6 +24,7 @@
! CDDL HEADER END
!
! Copyright 2008-2009 Sun Microsystems, Inc.
+ ! Portions Copyright 2011 ForgeRock AS.
! -->
<stax>
<!--- Test Case information
@@ -51,7 +52,7 @@
</message>
<call function="'backup'">
- { 'backupDir' : '%s/backends/backup1' % remote.data ,
+ { 'backupDir' : '%s/backends/backup1' % remote.temp ,
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
@@ -69,7 +70,7 @@
'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'backupDir' : '%s/backends/backup1' % remote.data,
+ 'backupDir' : '%s/backends/backup1' % remote.temp,
'extraParams' : '--completionNotify foo',
'expectedRC' : 1
}
@@ -84,7 +85,7 @@
'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'backupDir' : '%s/backends/backup1' % remote.data,
+ 'backupDir' : '%s/backends/backup1' % remote.temp,
'extraParams' : '--completionNotify foo@example.com',
'knownIssue' : '6947587'
}
@@ -130,7 +131,7 @@
</message>
<call function="'backup'">
- { 'backupDir' : '%s/backends/backup2' % remote.data ,
+ { 'backupDir' : '%s/backends/backup2' % remote.temp ,
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
@@ -148,7 +149,7 @@
'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'backupDir' : '%s/backends/backup2' % remote.data,
+ 'backupDir' : '%s/backends/backup2' % remote.temp,
'extraParams' : '--errorNotify foo',
'expectedRC' : 1
}
@@ -163,7 +164,7 @@
'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'backupDir' : '%s/backends/backup2' % remote.data,
+ 'backupDir' : '%s/backends/backup2' % remote.temp,
'extraParams' : '--errorNotify foo@example.com'
}
</call>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/backends/restore/restore_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/backends/restore/restore_tests.xml
index acc3308..8533c00 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/backends/restore/restore_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/backends/restore/restore_tests.xml
@@ -24,6 +24,7 @@
! CDDL HEADER END
!
! Copyright 2009 Sun Microsystems, Inc.
+ ! Portions Copyright 2011 ForgeRock AS.
! -->
<stax>
<!--- Test Case information
@@ -48,7 +49,7 @@
'Backend Restore 001: Create a backup of the data in OpenDS'
</message>
<call function="'backup'">
- { 'backupDir' : '%s/backends/backup1' % remote.data
+ { 'backupDir' : '%s/backends/backup1' % remote.temp
}
</call>
@@ -67,7 +68,7 @@
</call>
<call function="'restore'">
- { 'backupDir' : '%s/backends/backup1' % remote.data
+ { 'backupDir' : '%s/backends/backup1' % remote.temp
}
</call>
@@ -127,7 +128,7 @@
</message>
<call function="'backup'">
- { 'backupDir' : '%s/restore.compressed' % remote.data ,
+ { 'backupDir' : '%s/restore.compressed' % remote.temp ,
'extraParams' : '-c'
}
</call>
@@ -206,7 +207,7 @@
</call>
<call function="'restore'">
- { 'backupDir' : '%s/restore.compressed' % remote.data
+ { 'backupDir' : '%s/restore.compressed' % remote.temp
}
</call>
@@ -293,7 +294,7 @@
'Backend Restore 003: Create an encrypted and signhashed backup of the data in OpenDS'
</message>
<call function="'backup'">
- { 'backupDir' : '%s/backends/backup3' % remote.data ,
+ { 'backupDir' : '%s/backends/backup3' % remote.temp ,
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstanceAdminPort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
@@ -318,7 +319,7 @@
'Backend Restore 003: Create an encrypted, hashed and signhashed backup of the data in OpenDS'
</message>
<call function="'backup'">
- { 'backupDir' : '%s/backends/backup3' % remote.data ,
+ { 'backupDir' : '%s/backends/backup3' % remote.temp ,
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
@@ -332,7 +333,7 @@
</message>
<call function="'restore'">
- { 'backupDir' : '%s/backends/backup3' % remote.data ,
+ { 'backupDir' : '%s/backends/backup3' % remote.temp ,
'extraParams' : '-l' ,
'knownIssue' : '4203'
}
@@ -354,7 +355,7 @@
<call function="'restore'">
- { 'backupDir' : '%s/backends/backup3' % remote.data ,
+ { 'backupDir' : '%s/backends/backup3' % remote.temp ,
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
diff --git a/opends/tests/staf-tests/shared/functions/dsadm.xml b/opends/tests/staf-tests/shared/functions/dsadm.xml
index b7f0aec..b8c784b 100755
--- a/opends/tests/staf-tests/shared/functions/dsadm.xml
+++ b/opends/tests/staf-tests/shared/functions/dsadm.xml
@@ -24,6 +24,7 @@
! CDDL HEADER END
!
! Copyright 2007-2010 Sun Microsystems, Inc.
+ ! Portions Copyright 2011 ForgeRock AS.
! -->
<stax>
@@ -937,9 +938,15 @@
STAFCmdParamsList.append('-S')
if skipFile:
+ if not os.path.exists(os.path.dirname(skipFile)):
+ os.makedirs(os.path.dirname(skipFile))
+
STAFCmdParamsList.append('--skipFile %s' % skipFile)
if rejectFile:
+ if not os.path.exists(os.path.dirname(skipFile)):
+ os.makedirs(os.path.dirname(skipFile))
+
STAFCmdParamsList.append('-R %s' % rejectFile)
if overwriteFile:
@@ -1479,6 +1486,9 @@
STAFCmdParamsList.append('-p %s' % dsInstancePort)
if ldifFile:
+ if not os.path.exists(os.path.dirname(ldifFile)):
+ os.makedirs(os.path.dirname(ldifFile))
+
STAFCmdParamsList.append('-l %s' % ldifFile)
if startTask:
--
Gitblit v1.10.0