From 5d650a123e46c0c86fe3e440fc9dbf04cd831fc9 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Wed, 15 Jun 2011 15:51:32 +0000
Subject: [PATCH] Tidy up unit-tests so that not all backends are always enabled, and replication related databases are deleted after tests.
---
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java
index 9eb01bf..32556b1 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java
@@ -23,9 +23,12 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.replication.server;
+import org.opends.server.util.StaticUtils;
+import java.io.File;
import static org.opends.server.loggers.ErrorLogger.logError;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.loggers.debug.DebugLogger.getTracer;
@@ -483,19 +486,25 @@
{
replServer1.clearDb();
replServer1.remove();
+ StaticUtils.recursiveDelete(new File(DirectoryServer.getInstanceRoot(),
+ replServer1.getDbDirName()));
replServer1 = null;
}
if (replServer2 != null)
{
replServer2.clearDb();
replServer2.remove();
+ StaticUtils.recursiveDelete(new File(DirectoryServer.getInstanceRoot(),
+ replServer2.getDbDirName()));
replServer2 = null;
}
if (replServer3 != null)
{
replServer3.clearDb();
replServer3.remove();
- replServer3 = null;
+ StaticUtils.recursiveDelete(new File(DirectoryServer.getInstanceRoot(),
+ replServer3.getDbDirName()));
+ replServer3 = null;
}
super.cleanRealEntries();
--
Gitblit v1.10.0