You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2013/11/13 13:13:25 UTC
svn commit: r1541488 - in
/karaf/trunk/itests/src/test/java/org/apache/karaf/itests:
KarafTestSupport.java RegionTest.java WebTest.java
Author: cschneider
Date: Wed Nov 13 12:13:24 2013
New Revision: 1541488
URL: http://svn.apache.org/r1541488
Log:
Increase command timeout and remove manual sleeps
Modified:
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/RegionTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/WebTest.java
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java?rev=1541488&r1=1541487&r2=1541488&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java Wed Nov 13 12:13:24 2013
@@ -75,7 +75,7 @@ public class KarafTestSupport {
public static final String HTTP_PORT = "9081";
public static final String RMI_REG_PORT = "1100";
- static final Long COMMAND_TIMEOUT = 10000L;
+ static final Long COMMAND_TIMEOUT = 30000L;
static final Long SERVICE_TIMEOUT = 30000L;
private static Logger LOG = LoggerFactory.getLogger(KarafTestSupport.class);
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/RegionTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/RegionTest.java?rev=1541488&r1=1541487&r2=1541488&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/RegionTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/RegionTest.java Wed Nov 13 12:13:24 2013
@@ -27,7 +27,6 @@ public class RegionTest extends KarafTes
@Test
public void infoCommand() throws Exception {
- Thread.sleep(1000);
String infoOutput = executeCommand("region:info");
System.out.println(infoOutput);
assertTrue("Region org.eclipse.equinox.region.kernel should be present", infoOutput.contains("org.eclipse.equinox.region.kernel"));
@@ -36,7 +35,6 @@ public class RegionTest extends KarafTes
@Test
public void addRegionCommand() throws Exception {
- Thread.sleep(2000);
System.out.println(executeCommand("region:addregion itest"));
String infoOutput = executeCommand("region:info");
System.out.println(infoOutput);
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/WebTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/WebTest.java?rev=1541488&r1=1541487&r2=1541488&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/WebTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/WebTest.java Wed Nov 13 12:13:24 2013
@@ -35,9 +35,6 @@ public class WebTest extends KarafTestSu
@Before
public void installWarFeature() throws Exception {
installAndAssertFeature("war");
- assertBundleInstalled("org.apache.karaf.web.command");
- //just sleep for a while so blueprint is able to pick up the new commands.
- Thread.sleep(2000);
}
@Test