From 2bb53a0b19b5fce4d4540f33bcaaa2e95ddcebcf Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Thu, 27 May 2010 12:27:58 +0000
Subject: [PATCH] Update or Add tests for ACI replication, import-ldif, security/account_activation clu_secure...
---
opends/tests/staf-tests/functional-tests/testcases/replication/ldifimport/ldifimport.xml | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/opends/tests/staf-tests/functional-tests/testcases/replication/ldifimport/ldifimport.xml b/opends/tests/staf-tests/functional-tests/testcases/replication/ldifimport/ldifimport.xml
index ec3957b..f8e4966 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/replication/ldifimport/ldifimport.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/replication/ldifimport/ldifimport.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2007-2009 Sun Microsystems, Inc.
+ ! Copyright 2007-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -122,8 +122,8 @@
<call function="'ImportLdifWithScript'">
{ 'location' : masterHost,
'dsPath' : masterPath,
- 'dsBackEnd' : DIRECTORY_INSTANCE_BE,
- 'dsLdifFile' : '%s/replication/Example.ldif' % masterDataDir
+ 'backEnd' : DIRECTORY_INSTANCE_BE,
+ 'ldifFile' : '%s/replication/Example.ldif' % masterDataDir
}
</call>
@@ -160,8 +160,8 @@
<call function="'ImportLdifWithScript'">
{ 'location' : consumer.getHostname(),
'dsPath' : '%s/%s' % (consumer.getDir(), OPENDSNAME),
- 'dsBackEnd' : DIRECTORY_INSTANCE_BE,
- 'dsLdifFile' : '%s/%s/replication/master_export.ldif' \
+ 'backEnd' : DIRECTORY_INSTANCE_BE,
+ 'ldifFile' : '%s/%s/replication/master_export.ldif' \
% (consumer.getDir(),remote.reldatadir)
}
</call>
@@ -285,14 +285,13 @@
'+++++ ldif import on-line: import data on %s:%s' \
% (masterHost, master.getPort())
</message>
- <call function="'importLdifTask'">
+ <call function="'ImportLdifWithScript'">
{ 'location' : clientHost,
'dsPath' : clientPath,
'dsInstanceHost' : masterHost,
- 'dsInstancePort' : master.getPort(),
+ 'dsInstanceAdminPort' : master.getAdminPort(),
'dsInstanceDn' : master.getRootDn(),
'dsInstancePswd' : master.getRootPwd(),
- 'taskID' : 'import task',
'ldifFile' : '%s/replication/Example.ldif' \
% masterDataDir
}
@@ -357,14 +356,13 @@
'+++++ ldif import on-line: import exported file on %s:%s'\
% (consumer.getHostname(), consumer.getPort())
</message>
- <call function="'importLdifTask'">
+ <call function="'ImportLdifWithScript'">
{ 'location' : clientHost,
'dsPath' : clientPath,
'dsInstanceHost' : consumer.getHostname(),
- 'dsInstancePort' : consumer.getPort(),
+ 'dsInstanceAdminPort' : consumer.getAdminPort(),
'dsInstanceDn' : consumer.getRootDn(),
'dsInstancePswd' : consumer.getRootPwd(),
- 'taskID' : 'import task',
'ldifFile' : destinationFile
}
</call>
--
Gitblit v1.10.0