From 10f491150f0f0db50543d3dd06d9d742a1504a3d Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Mon, 18 Jul 2011 17:44:11 +0000
Subject: [PATCH] Another pass at tidying up replication related tests and reducing dependencies between them.
---
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/DependencyTest.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/DependencyTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/DependencyTest.java
index 265a386..2b30de4 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/DependencyTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/DependencyTest.java
@@ -23,9 +23,12 @@
*
*
* Copyright 2007-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.replication;
+import org.opends.server.util.StaticUtils;
+import java.io.File;
import static org.testng.Assert.*;
import java.io.FileNotFoundException;
@@ -231,9 +234,11 @@
}
finally
{
- if (replServer != null)
+ if (replServer != null) {
replServer.remove();
-
+ StaticUtils.recursiveDelete(new File(DirectoryServer.getInstanceRoot(),
+ replServer.getDbDirName()));
+ }
if (domain != null)
MultimasterReplication.deleteDomain(baseDn);
}
@@ -350,8 +355,11 @@
}
finally
{
- if (replServer != null)
+ if (replServer != null) {
replServer.remove();
+ StaticUtils.recursiveDelete(new File(DirectoryServer.getInstanceRoot(),
+ replServer.getDbDirName()));
+ }
if (domain != null)
MultimasterReplication.deleteDomain(baseDn);
@@ -511,8 +519,11 @@
}
finally
{
- if (replServer != null)
+ if (replServer != null) {
replServer.remove();
+ StaticUtils.recursiveDelete(new File(DirectoryServer.getInstanceRoot(),
+ replServer.getDbDirName()));
+ }
if (domain != null)
MultimasterReplication.deleteDomain(baseDn);
@@ -620,8 +631,11 @@
}
finally
{
- if (replServer != null)
+ if (replServer != null) {
replServer.remove();
+ StaticUtils.recursiveDelete(new File(DirectoryServer.getInstanceRoot(),
+ replServer.getDbDirName()));
+ }
if (domain != null)
MultimasterReplication.deleteDomain(baseDn);
--
Gitblit v1.10.0