From 1b5b4e06d911ca8657fa156a1580c720108d21f1 Mon Sep 17 00:00:00 2001
From: el_kaboing <el_kaboing@localhost>
Date: Fri, 25 Aug 2006 20:36:30 +0000
Subject: [PATCH] Added the Security and Backend Test Suites to the Windows version. Tightened the code for starting and stopping the OpenDS.
---
opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSIntegrationTests.java | 22 ++++++++++------------
opends/tests/integration-tests-testng/ext/testng/testng-windows.xml | 12 ++++++++++++
2 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/opends/tests/integration-tests-testng/ext/testng/testng-windows.xml b/opends/tests/integration-tests-testng/ext/testng/testng-windows.xml
index 7ed9d6b..2319e2e 100644
--- a/opends/tests/integration-tests-testng/ext/testng/testng-windows.xml
+++ b/opends/tests/integration-tests-testng/ext/testng/testng-windows.xml
@@ -16,6 +16,8 @@
<package name="org.opends.server.integration.core"/>
<package name="org.opends.server.integration.frontend"/>
<package name="org.opends.server.integration.schema"/>
+ <package name="org.opends.server.integration.security"/>
+ <package name="org.opends.server.integration.backend"/>
</packages>
<test name="precommit">
@@ -35,6 +37,8 @@
<include name="core"/>
<include name="frontend"/>
<include name="schema"/>
+ <include name="security"/>
+ <include name="backend"/>
</define>
<define name="quickstart">
@@ -57,6 +61,14 @@
<include name="schema"/>
</define>
+ <define name="security">
+ <include name="security"/>
+ </define>
+
+ <define name="backend">
+ <include name="backend"/>
+ </define>
+
<run>
<include name="all"/>
</run>
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSIntegrationTests.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSIntegrationTests.java
index 2094263..9c961c3 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSIntegrationTests.java
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSIntegrationTests.java
@@ -108,24 +108,22 @@
public void startOpenDS(String dsee_home, String port) throws Exception
{
String osName = new String(System.getProperty("os.name"));
-
+ String exec_cmd = "";
+ System.out.println("OpenDS is starting.....");
+
if (osName.indexOf("Windows") >= 0) // For Windows
{
- String exec_cmd = "CMD /C " + dsee_home + "\\bin\\start-ds";
- Runtime rtime = Runtime.getRuntime();
- Process child = rtime.exec(exec_cmd);
- //child.waitFor();
+ exec_cmd = "CMD /C " + dsee_home + "\\bin\\start-ds";
}
else
{
- System.out.println("OpenDS is starting.....");
- String exec_cmd = dsee_home + "/bin/start-ds.sh -nodetach";
- Runtime rtime = Runtime.getRuntime();
- Process child = rtime.exec(exec_cmd);
- //child.waitFor();
- dsAdmin.sleep(30000);
- System.out.println("OpenDS has started.");
+ exec_cmd = dsee_home + "/bin/start-ds.sh -nodetach";
}
+
+ Runtime rtime = Runtime.getRuntime();
+ Process child = rtime.exec(exec_cmd);
+ dsAdmin.sleep(30000);
+ System.out.println("OpenDS has started.");
}
public void stopOpenDS(String dsee_home, String port) throws Exception
--
Gitblit v1.10.0