From e37077ea552a101d04e834ef50b24d0d06c6e498 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Thu, 30 Aug 2007 10:14:25 +0000
Subject: [PATCH] Fix issue 2192: dsconfig delete-backend doesn't work
---
opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileSystemEntryCacheTestCase.java | 4 ++--
opends/src/server/org/opends/server/tools/dsconfig/DeleteSubCommandHandler.java | 22 ++++++++++++----------
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/dsconfig/DeleteSubCommandHandler.java b/opends/src/server/org/opends/server/tools/dsconfig/DeleteSubCommandHandler.java
index e24bbfd..06de23f 100644
--- a/opends/src/server/org/opends/server/tools/dsconfig/DeleteSubCommandHandler.java
+++ b/opends/src/server/org/opends/server/tools/dsconfig/DeleteSubCommandHandler.java
@@ -329,18 +329,20 @@
// Confirm deletion.
private boolean confirmDeletion(ConsoleApplication app) throws CLIException {
- Message prompt = INFO_DSCFG_CONFIRM_DELETE.get(relation
- .getUserFriendlyName());
- app.println();
- if (!app.confirmAction(prompt, false)) {
- // Output failure message.
- Message msg = INFO_DSCFG_CONFIRM_DELETE_FAIL.get(relation
+ if (app.isInteractive()) {
+ Message prompt = INFO_DSCFG_CONFIRM_DELETE.get(relation
.getUserFriendlyName());
- app.printVerboseMessage(msg);
- return false;
- } else {
- return true;
+ app.println();
+ if (!app.confirmAction(prompt, false)) {
+ // Output failure message.
+ Message msg = INFO_DSCFG_CONFIRM_DELETE_FAIL.get(relation
+ .getUserFriendlyName());
+ app.printVerboseMessage(msg);
+ return false;
+ }
}
+
+ return true;
}
}
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileSystemEntryCacheTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileSystemEntryCacheTestCase.java
index 9473fc3..43b2be7 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileSystemEntryCacheTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileSystemEntryCacheTestCase.java
@@ -619,7 +619,7 @@
/**
* Tests cache persistence with consistent backend.
*/
- @Test(enabled=false, groups = "slow")
+ @Test(groups = "slow")
@SuppressWarnings("unchecked")
public void testCachePersistence()
throws Exception
@@ -672,7 +672,7 @@
/**
* Tests cache persistence with inconsistent backend.
*/
- @Test(enabled=false, groups = "slow")
+ @Test(groups = "slow")
@SuppressWarnings("unchecked")
public void testCachePersistenceInconsistent()
throws Exception
--
Gitblit v1.10.0