From d5193b4f72a86a30a116b4629d1db5231dd42992 Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Mon, 26 Mar 2007 07:17:13 +0000
Subject: [PATCH] This commit allows to complete issues 504, 505 and 507 by using the new import/export/backup/restore interface to get notifications of import and restore and then resynchronize the server approprietely.
---
opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/ReSyncTest.java | 23 -----------------------
1 files changed, 0 insertions(+), 23 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/ReSyncTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/ReSyncTest.java
index 7a1844a..95917ec 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/ReSyncTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/ReSyncTest.java
@@ -42,7 +42,6 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.schema.DirectoryStringSyntax;
-import org.opends.server.synchronization.plugin.MultimasterSynchronization;
import org.opends.server.types.AttributeType;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
@@ -169,10 +168,6 @@
// we do test something.
connection.processDelete(DN.decode("dc=foo, dc=example,dc=com"));
- MultimasterSynchronization.notificationBackupStart(
- DN.decode("dc=example,dc=com")); // TEMPORARY UNTIL core server
- // sends a notification
-
task("dn: ds-task-id=" + UUID.randomUUID()
+ ",cn=Scheduled Tasks,cn=Tasks\n"
+ "objectclass: top\n"
@@ -185,9 +180,6 @@
addEntry("dn: dc=foo, dc=example,dc=com\n"
+ "objectClass: top\n" + "objectClass: domain\n");
- MultimasterSynchronization.notificationRestoreStart(
- DN.decode("dc=example,dc=com"));// TEMPORARY UNTIL core server
- // sends a notification
task("dn: ds-task-id=" + UUID.randomUUID()
+ ",cn=Scheduled Tasks,cn=Tasks\n"
+ "objectclass: top\n"
@@ -197,10 +189,6 @@
+ "ds-backup-directory-path: bak" + File.separator
+ "userRoot\n");
- MultimasterSynchronization.notificationRestoreEnd(
- DN.decode("dc=example,dc=com"));// TEMPORARY UNTIL core server
- // sends a notification
-
if (getEntry(DN.decode("dc=foo, dc=example,dc=com"), 30000, true) == null)
fail("The Directory has not been resynchronized after the restore.");
@@ -224,10 +212,6 @@
// we do test something.
connection.processDelete(DN.decode("dc=foo, dc=example,dc=com"));
- MultimasterSynchronization.notificationBackupStart(
- DN.decode("dc=example,dc=com")); // TEMPORARY UNTIL core server
- // sends a notification
-
String buildRoot = System.getProperty(TestCaseUtils.PROPERTY_BUILD_ROOT);
String path = buildRoot + File.separator + "build" +
File.separator + "unit-tests" + File.separator +
@@ -245,9 +229,6 @@
addEntry("dn: dc=foo, dc=example,dc=com\n"
+ "objectClass: top\n" + "objectClass: domain\n");
- MultimasterSynchronization.notificationRestoreStart(
- DN.decode("dc=example,dc=com"));// TEMPORARY UNTIL core server
- // sends a notification
task("dn: ds-task-id=" + UUID.randomUUID()
+ ",cn=Scheduled Tasks,cn=Tasks\n"
+ "objectclass: top\n"
@@ -258,10 +239,6 @@
+ "ds-task-import-ldif-file: " + path + "\n"
+ "ds-task-import-reject-file: " + path + "reject\n");
- MultimasterSynchronization.notificationRestoreEnd(
- DN.decode("dc=example,dc=com"));// TEMPORARY UNTIL core server
- // sends a notification
-
if (getEntry(DN.decode("dc=foo, dc=example,dc=com"), 30000, true) == null)
fail("The Directory has not been resynchronized after the restore.");
}
--
Gitblit v1.10.0