From 047be4e3579ed8f1078f0cab89e1fd8e8f5dd96f Mon Sep 17 00:00:00 2001
From: ugaston <ugaston@localhost>
Date: Mon, 19 Nov 2007 14:59:57 +0000
Subject: [PATCH] Replication testsuite maintenance changes

---
 opends/tests/functional-tests/testcases/replication/replication_setup.xml |   37 ++-----------------------------------
 1 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/opends/tests/functional-tests/testcases/replication/replication_setup.xml b/opends/tests/functional-tests/testcases/replication/replication_setup.xml
index d2727fe..f15ec03 100644
--- a/opends/tests/functional-tests/testcases/replication/replication_setup.xml
+++ b/opends/tests/functional-tests/testcases/replication/replication_setup.xml
@@ -91,40 +91,6 @@
             [_topologyServerList]
           </call>            
 
-          <!-- Special setup for testcase:   Replication: Total Update: Schema total update
-            Modify schema in one server before replication is enabled.  -->        
-          <if expr="CurrentTestPath['suite'] == 'main.replication.total-update'">
-            <sequence>
-              <script>
-                newObjectclass = '( testobjectclass1-oid NAME \'testobjectclass-1\' SUP person MAY ( street $ testattribute-1 $ c ) X-ORIGIN \'user defined\' )'
-                newAttributetype = '( testattribute1-oid NAME \'testattribute-1\' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 X-ORIGIN \'user defined\' )'
-              </script>
-                
-              <!-- Modify schema  in "master" server -->
-              <call function="'modifyAnAttribute'">
-                { 'dsPath' : masterPath,
-                  'dsInstanceHost'   : masterHost ,
-                  'dsInstancePort'    : master.getPort(),
-                  'dsInstanceDn'  : master.getRootDn(),
-                  'dsInstancePswd'    : master.getRootPwd(),
-                  'DNToModify'    : 'cn=schema',
-                  'attributeName' : 'attributeTypes',
-                  'newAttributeValue' : newAttributetype, 
-                  'changetype' : 'add' }
-              </call>                
-              <call function="'modifyAnAttribute'">
-                { 'dsPath' : masterPath,
-                  'dsInstanceHost'   : masterHost ,
-                  'dsInstancePort'    : master.getPort(),
-                  'dsInstanceDn'  : master.getRootDn(),
-                  'dsInstancePswd'    : master.getRootPwd(),
-                  'DNToModify'    : 'cn=schema',
-                  'attributeName' : 'objectClasses',
-                  'newAttributeValue' : newObjectclass, 
-                  'changetype' : 'add' }
-              </call>                
-            </sequence>
-          </if>
               
           <iterate var="server" in="consumerList">
             <sequence>
@@ -162,7 +128,8 @@
                       'refInstanceDn'  :  master.getRootDn(),
                       'refInstancePswd'  :  master.getRootPwd(),
                       'refReplicationPort'  :  masterReplicationServer.getPort(),
-                      'replicationDnList'  :  replicatedDnList }                      
+                      'replicationDnList'  :  replicatedDnList,
+                      'useSecondServerAsSchemaSource'  :  True }                      
                   </call>
                 </sequence>
               </if>                

--
Gitblit v1.10.0