activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kea...@apache.org
Subject git commit: Added timeouts because of hangs and very long runtimes on some CI boxes
Date Mon, 03 Nov 2014 16:11:44 GMT
Repository: activemq
Updated Branches:
  refs/heads/trunk 914d3939c -> b70fc9a07


Added timeouts because of hangs and very long runtimes on some CI boxes


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/b70fc9a0
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/b70fc9a0
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/b70fc9a0

Branch: refs/heads/trunk
Commit: b70fc9a0760a34761dd43240d885eab2c4eca131
Parents: 914d393
Author: Kevin Earls <kevin@kevinearls.com>
Authored: Mon Nov 3 17:08:55 2014 +0100
Committer: Kevin Earls <kevin@kevinearls.com>
Committed: Mon Nov 3 17:08:55 2014 +0100

----------------------------------------------------------------------
 .../activemq/karaf/itest/ActiveMQBrokerFeatureTest.java      | 4 ++--
 .../karaf/itest/ActiveMQBrokerNdCamelFeatureTest.java        | 2 +-
 .../itest/ActiveMQBrokerNdExternalCamelFeatureTest.java      | 2 +-
 .../karaf/itest/ActiveMQBrokerRuntimeConfigTest.java         | 2 +-
 .../activemq/karaf/itest/ActiveMQClientBundleTest.java       | 2 +-
 .../java/org/apache/activemq/karaf/itest/ObrFeatureTest.java | 8 ++++----
 6 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/b70fc9a0/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerFeatureTest.java
----------------------------------------------------------------------
diff --git a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerFeatureTest.java
b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerFeatureTest.java
index c384822..f16d235 100644
--- a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerFeatureTest.java
+++ b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerFeatureTest.java
@@ -42,7 +42,7 @@ public class ActiveMQBrokerFeatureTest extends AbstractJmsFeatureTest {
         return configureBrokerStart(configure("activemq"));
     }
 
-    @Test
+    @Test(timeout=2 * 60 * 1000)
     public void test() throws Throwable {
 
         withinReason(new Callable<Boolean>() {
@@ -72,7 +72,7 @@ public class ActiveMQBrokerFeatureTest extends AbstractJmsFeatureTest {
         assertEquals("got our message", nameAndPayload, consumeMessage(nameAndPayload));
     }
 
-    @Test
+    @Test(timeout = 5 * 60 * 1000)
     public void testTemporaryDestinations() throws Throwable {
         Connection connection = getConnection();
         Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);

http://git-wip-us.apache.org/repos/asf/activemq/blob/b70fc9a0/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdCamelFeatureTest.java
----------------------------------------------------------------------
diff --git a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdCamelFeatureTest.java
b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdCamelFeatureTest.java
index d46fce7..dfb429d 100644
--- a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdCamelFeatureTest.java
+++ b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdCamelFeatureTest.java
@@ -40,7 +40,7 @@ public class ActiveMQBrokerNdCamelFeatureTest extends AbstractJmsFeatureTest
{
         ), "activemq-camel"), baseOptions), "activemq-nd-camel");
     }
 
-    @Test
+    @Test(timeout = 2 * 60 * 1000)
     public void test() throws Throwable {
         System.err.println(executeCommand("osgi:list").trim());
 

http://git-wip-us.apache.org/repos/asf/activemq/blob/b70fc9a0/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdExternalCamelFeatureTest.java
----------------------------------------------------------------------
diff --git a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdExternalCamelFeatureTest.java
b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdExternalCamelFeatureTest.java
index a5fb02b..e08bed0 100644
--- a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdExternalCamelFeatureTest.java
+++ b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdExternalCamelFeatureTest.java
@@ -45,7 +45,7 @@ public class ActiveMQBrokerNdExternalCamelFeatureTest extends AbstractJmsFeature
         ), "activemq-camel"), baseOptions));
     }
 
-    @Test
+    @Test(timeout = 2 * 60 * 1000)
     public void test() throws Throwable {
 
         System.err.println(executeCommand("features:list").trim());

http://git-wip-us.apache.org/repos/asf/activemq/blob/b70fc9a0/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerRuntimeConfigTest.java
----------------------------------------------------------------------
diff --git a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerRuntimeConfigTest.java
b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerRuntimeConfigTest.java
index 4389294..a9e78b9 100644
--- a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerRuntimeConfigTest.java
+++ b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerRuntimeConfigTest.java
@@ -45,7 +45,7 @@ public class ActiveMQBrokerRuntimeConfigTest extends AbstractJmsFeatureTest
{
                                 configure("activemq")), "activemq-runtime-config"));
     }
 
-    @Test
+    @Test(timeout = 2 * 60 * 1000)
     public void test() throws Throwable {
 
         withinReason(new Callable<Boolean>() {

http://git-wip-us.apache.org/repos/asf/activemq/blob/b70fc9a0/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQClientBundleTest.java
----------------------------------------------------------------------
diff --git a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQClientBundleTest.java
b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQClientBundleTest.java
index c85aede..efccfbb 100644
--- a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQClientBundleTest.java
+++ b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQClientBundleTest.java
@@ -31,7 +31,7 @@ public class ActiveMQClientBundleTest extends AbstractFeatureTest {
         return configure("activemq-client");
     }
 
-    @Test
+    @Test(timeout = 2 * 60 * 1000)
     public void test() throws Exception {
         ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory();
         factory.getBrokerURL();

http://git-wip-us.apache.org/repos/asf/activemq/blob/b70fc9a0/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ObrFeatureTest.java
----------------------------------------------------------------------
diff --git a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ObrFeatureTest.java
b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ObrFeatureTest.java
index 25a2bd3..0260dde 100644
--- a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ObrFeatureTest.java
+++ b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ObrFeatureTest.java
@@ -38,22 +38,22 @@ public class ObrFeatureTest extends AbstractFeatureTest {
                 configure("obr"));
 	}
 
-	@Test
+	@Test(timeout=5 * 60 * 1000)
 	public void testClient() throws Throwable {
 		installAndAssertFeature("activemq-client");
 	}
 
-	@Test
+	@Test(timeout=5 * 60 * 1000)
 	public void testActiveMQ() throws Throwable {
 		installAndAssertFeature("activemq");
 	}
 
-    @Test
+    @Test(timeout=5 * 60 * 1000)
    	public void testBroker() throws Throwable {
    		installAndAssertFeature("activemq-broker");
    	}
 
-    @Test
+    @Test(timeout=5 * 60 * 1000)
    	public void testCamel() throws Throwable {
         System.err.println(executeCommand("features:addurl " + getCamelFeatureUrl()));
    		installAndAssertFeature("activemq-camel");


Mime
View raw message