[karaf] branch karaf-4.2.x updated: Reduce itest timeout (especially from command) to speed up some itests

[jbonofre]

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
     new ffcff78  Reduce itest timeout (especially from command) to speed up 
some itests
ffcff78 is described below

commit ffcff7887642200564076bfe74c9d083cda2d122
Author: Jean-Baptiste Onofré <jbono...@apache.org>
AuthorDate: Tue Oct 22 18:51:14 2019 +0200

    Reduce itest timeout (especially from command) to speed up some itests
---
 .../src/main/java/org/apache/karaf/itests/KarafTestSupport.java     | 6 +++---
 itests/test/src/test/java/org/apache/karaf/itests/EquinoxTest.java  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/itests/common/src/main/java/org/apache/karaf/itests/KarafTestSupport.java 
b/itests/common/src/main/java/org/apache/karaf/itests/KarafTestSupport.java
index 38094b3..da8e810 100644
--- a/itests/common/src/main/java/org/apache/karaf/itests/KarafTestSupport.java
+++ b/itests/common/src/main/java/org/apache/karaf/itests/KarafTestSupport.java
@@ -88,9 +88,9 @@ public class KarafTestSupport {
     public static final String MIN_SSH_PORT = "8101";
     public static final String MAX_SSH_PORT = "8888";
 
-    static final Long COMMAND_TIMEOUT = 3600000L;
-    static final Long SERVICE_TIMEOUT = 3600000L;
-    static final long BUNDLE_TIMEOUT = 3600000L;
+    static final Long COMMAND_TIMEOUT = 360000L;
+    static final Long SERVICE_TIMEOUT = 360000L;
+    static final long BUNDLE_TIMEOUT = 360000L;
 
     private static Logger LOG = 
LoggerFactory.getLogger(KarafTestSupport.class);
 
diff --git a/itests/test/src/test/java/org/apache/karaf/itests/EquinoxTest.java 
b/itests/test/src/test/java/org/apache/karaf/itests/EquinoxTest.java
index 31e6f2b..a75b939 100644
--- a/itests/test/src/test/java/org/apache/karaf/itests/EquinoxTest.java
+++ b/itests/test/src/test/java/org/apache/karaf/itests/EquinoxTest.java
@@ -42,7 +42,7 @@ public class EquinoxTest extends BaseTest {
 
     @Test
     public void simpleTest() throws Exception {
-        assertContains("org.eclipse.osgi", executeCommand("shell:info", 
36000L, false));
+        assertContains("org.eclipse.osgi", executeCommand("shell:info"));
     }
 
 }