From 1c47785140a438dea398e1cca4a1640e8ccf7b30 Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Mon, 20 Aug 2007 08:58:23 +0000
Subject: [PATCH] Explicitly set backend name in replication tests
---
opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/replication_ldifimport.xml | 6 ++++--
opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/replication_schema.xml | 15 +++++++--------
opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/replication_resynchronization.xml | 3 ++-
opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml | 3 ++-
opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/replication_binarycopy.xml | 3 ++-
5 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/replication_binarycopy.xml b/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/replication_binarycopy.xml
index 5bdc278..eaba5d8 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/replication_binarycopy.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/replication_binarycopy.xml
@@ -90,7 +90,8 @@
<!-- Import data into "master" server -->
<call function="'ImportLdifWithScript'">
{ 'location' : masterHost,
- 'dsPath' : masterPath,
+ 'dsPath' : masterPath,
+ 'dsBackEnd' : 'userRoot',
'dsLdifFile' : '%s/replication/Example.ldif' % masterDataDir }
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/replication_ldifimport.xml b/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/replication_ldifimport.xml
index 94bbfa6..d861f0a 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/replication_ldifimport.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/replication_ldifimport.xml
@@ -90,7 +90,8 @@
<!-- Import data into "master" server -->
<call function="'ImportLdifWithScript'">
{ 'location' : masterHost,
- 'dsPath' : masterPath,
+ 'dsPath' : masterPath,
+ 'dsBackEnd' : 'userRoot',
'dsLdifFile' : '%s/replication/Example.ldif' % masterDataDir }
</call>
@@ -127,7 +128,8 @@
<call function="'ImportLdifWithScript'">
{ 'location' : consumer.getHostname(),
- 'dsPath' : '%s/%s' % (consumer.getDir(), OPENDSNAME),
+ 'dsPath' : '%s/%s' % (consumer.getDir(), OPENDSNAME),
+ 'dsBackEnd' : 'userRoot',
'dsLdifFile' : '%s/%s/replication/master_export.ldif' % (consumer.getDir(),relativeDataDir) }
</call>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/replication_resynchronization.xml b/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/replication_resynchronization.xml
index 1e6d330..f465179 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/replication_resynchronization.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/replication_resynchronization.xml
@@ -90,7 +90,8 @@
<!-- Import data into "master" server -->
<call function="'ImportLdifWithScript'">
{ 'location' : masterHost,
- 'dsPath' : masterPath,
+ 'dsPath' : masterPath,
+ 'dsBackEnd' : 'userRoot',
'dsLdifFile' : '%s/replication/Example.ldif' % masterDataDir }
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/replication_schema.xml b/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/replication_schema.xml
index 002b6f9..facea2a 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/replication_schema.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/replication_schema.xml
@@ -233,7 +233,7 @@
- <!--- Test Case information
+ <!-- Test Case information
#@TestMarker Replication Schema Replication Tests
#@TestName Replication: Schema Replication: Delete objectclass
#@TestID Delete objectclass
@@ -242,7 +242,7 @@
#@TestSteps
#@TestPostamble
#@TestResult
-
+ -->
<testcase name="getTestCaseName('Delete objectclass')">
<sequence>
<call function="'testCase_Preamble'"/>
@@ -254,7 +254,7 @@
newObjectclass = '( testobjectclass-oid NAME \'testobjectclass-0\' SUP person MAY ( street $ c ) X-ORIGIN \'user defined\' )'
</script>
- <!-- Modify schema in "master" server
+ <!-- Modify schema in "master" server -->
<call function="'modifyAnAttribute'">
{ 'dsPath' : masterPath,
'dsInstanceHost' : masterHost ,
@@ -267,7 +267,7 @@
'changetype' : 'delete' }
</call>
- <!-- Try to add entry to servers; should be rejected with error 65 (objectclass violation)
+ <!-- Try to add entry to servers; should be rejected with error 65 (objectclass violation) -->
<iterate var="server" in="_topologyServerList">
<call function="'addEntry'">
{ 'location' : clientHost,
@@ -281,20 +281,19 @@
</call>
</iterate>
- <!-- Verify the synchronization of the schema among the servers in the topology
+ <!-- Verify the synchronization of the schema among the servers in the topology -->
<call function="'verifySchemas'">
[ clientHost, clientPath, master, consumerList, '99-user.ldif' ]
</call>
- <!-- Verify the synchronization of the trees among the servers in the topology
+ <!-- Verify the synchronization of the trees among the servers in the topology -->
<call function="'verifyTrees'">
[ clientHost, clientPath, master, consumerList, synchroSuffix ]
</call>
<call function="'testCase_Postamble'"/>
</sequence>
- </testcase>
--->
+ </testcase>
<import machine="STAF_LOCAL_HOSTNAME"
file="'%s/testcases/replication/replication_cleanup.xml' % (TESTS_DIR)"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml b/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml
index ff2b70c..bab91c4 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml
@@ -74,7 +74,8 @@
<!-- Import data into Directory Server -->
<call function="'ImportLdifWithScript'">
{ 'location' : server1.getHostname() ,
- 'dsPath' : '%s/%s' % (server1.getDir(),OPENDSNAME),
+ 'dsPath' : '%s/%s' % (server1.getDir(),OPENDSNAME),
+ 'dsBackEnd' : 'userRoot',
'dsLdifFile' : '%s/replication/Example.ldif' % server1DataDir }
</call>
--
Gitblit v1.10.0