From 971c40817ab4ec0508a9646075befd4d0e05d6f6 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Sun, 26 Aug 2007 20:41:30 +0000
Subject: [PATCH] Fix the unit tests and the dsconfig.xml to run in non-prompt mode. Remove a duplicate message in admin_tools.properties.
---
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java | 5 +++--
opendj-sdk/opends/tests/functional-tests/shared/functions/dsconfig.xml | 2 ++
opendj-sdk/opends/src/messages/messages/admin_tool.properties | 1 -
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/opendj-sdk/opends/src/messages/messages/admin_tool.properties b/opendj-sdk/opends/src/messages/messages/admin_tool.properties
index cc17bc2..29b6547 100644
--- a/opendj-sdk/opends/src/messages/messages/admin_tool.properties
+++ b/opendj-sdk/opends/src/messages/messages/admin_tool.properties
@@ -266,7 +266,6 @@
INFO_STATE_COLUMN=State
INFO_STATUS_CLI_USAGE_DESCRIPTION=This utility may be used to display basic \
server information
-INFO_CLI_INVALID_PORT=The provided value is not a valid port
SEVERE_ERR_STATUS_PANEL_LAUNCHER_GUI_LAUNCH_FAILED=Could not launch Status \
Panel. Check that you have access to the display.
SEVERE_ERR_STATUS_PANEL_LAUNCHER_GUI_LAUNCH_FAILED_DETAILS=Could not launch \
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/functions/dsconfig.xml b/opendj-sdk/opends/tests/functional-tests/shared/functions/dsconfig.xml
index 19b2808..2746b0e 100755
--- a/opendj-sdk/opends/tests/functional-tests/shared/functions/dsconfig.xml
+++ b/opendj-sdk/opends/tests/functional-tests/shared/functions/dsconfig.xml
@@ -44,6 +44,8 @@
if dsInstancePswd:
STAFCmdParamsList.append('-w "%s"' % dsInstancePswd)
+
+ STAFCmdParamsList.append('-n')
</script>
</function>
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
index cd9807f..e61f1d0 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
@@ -1231,7 +1231,7 @@
*/
public static void dsconfig(String... args)
{
- String[] fullArgs = new String[args.length + 8];
+ String[] fullArgs = new String[args.length + 9];
fullArgs[0] = "-h";
fullArgs[1] = "127.0.0.1";
fullArgs[2] = "-p";
@@ -1240,8 +1240,9 @@
fullArgs[5] = "cn=Directory Manager";
fullArgs[6] = "-w";
fullArgs[7] = "password";
+ fullArgs[8] = "-n";
- System.arraycopy(args, 0, fullArgs, 8, args.length);
+ System.arraycopy(args, 0, fullArgs, 9, args.length);
assertEquals(DSConfig.main(fullArgs, false, System.out, System.err), 0);
}
--
Gitblit v1.10.0