From 530c736a46caa31efac5c6be33a0c429eb8fb2a7 Mon Sep 17 00:00:00 2001
From: pgamba <pgamba@localhost>
Date: Thu, 22 Oct 2009 16:17:09 +0000
Subject: [PATCH] Remove useless MultimasterReplication plugin from unit tests
---
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ExternalChangeLogTest.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ExternalChangeLogTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ExternalChangeLogTest.java
index 83e0032..b0c2cc3 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ExternalChangeLogTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ExternalChangeLogTest.java
@@ -639,8 +639,7 @@
DomainFakeCfg domainConf =
new DomainFakeCfg(baseDn2, 1602, replServers);
LDAPReplicationDomain domain2 = MultimasterReplication.createNewDomain(domainConf);
- SynchronizationProvider replicationPlugin = new MultimasterReplication();
- replicationPlugin.completeSynchronizationProvider();
+ domain2.start();
sleep(1000);
Entry e = createEntry(baseDn2);
addEntry(e);
@@ -741,8 +740,6 @@
// Cleaning
if (domain2 != null)
MultimasterReplication.deleteDomain(baseDn2);
- if (replicationPlugin != null)
- DirectoryServer.deregisterSynchronizationProvider(replicationPlugin);
removeTestBackend2(backend2);
server01.stop();
@@ -3464,6 +3461,7 @@
includeAttributes.add("sn");
domainConf.setEclIncludes(includeAttributes);
domain2 = MultimasterReplication.createNewDomain(domainConf);
+ domain2.start();
backend3 = initializeTestBackend(false,
TEST_ROOT_DN_STRING3, TEST_BACKEND_ID3);
@@ -3474,6 +3472,7 @@
includeAttributes.add("objectclass");
domainConf.setEclIncludes(includeAttributes);
domain3 = MultimasterReplication.createNewDomain(domainConf);
+ domain3.start();
domainConf =
new DomainFakeCfg(baseDn2, 1704, replServers);
@@ -3481,6 +3480,7 @@
includeAttributes.add("cn");
domainConf.setEclIncludes(includeAttributes);
domain21 = MultimasterReplication.createNewDomain(domainConf);
+ domain21.start();
sleep(1000);
@@ -3649,6 +3649,9 @@
waitOpResult(delOp, ResultCode.SUCCESS);
// Cleaning
+ if (domain21 != null)
+ domain21.shutdown();
+
if (domain2 != null)
MultimasterReplication.deleteDomain(baseDn2);
removeTestBackend2(backend2);
@@ -3656,6 +3659,7 @@
if (domain3 != null)
MultimasterReplication.deleteDomain(baseDn3);
removeTestBackend2(backend3);
+
}
catch(Exception e) {}
}
--
Gitblit v1.10.0