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 after seeing this hang a CI build.
Date Fri, 15 Nov 2013 13:33:33 GMT
Updated Branches:
  refs/heads/trunk ff593bf3d -> a46db89b2


Added timeouts after seeing this hang a CI build.


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

Branch: refs/heads/trunk
Commit: a46db89b2a691f979d722e51a9540e7dfd61a845
Parents: ff593bf
Author: Kevin Earls <kevin@kevinearls.com>
Authored: Fri Nov 15 14:33:26 2013 +0100
Committer: Kevin Earls <kevin@kevinearls.com>
Committed: Fri Nov 15 14:33:26 2013 +0100

----------------------------------------------------------------------
 .../org/apache/activemq/network/SimpleNetworkTest.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/a46db89b/activemq-unit-tests/src/test/java/org/apache/activemq/network/SimpleNetworkTest.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/network/SimpleNetworkTest.java
b/activemq-unit-tests/src/test/java/org/apache/activemq/network/SimpleNetworkTest.java
index 52b4984..62385cb 100755
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/network/SimpleNetworkTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/network/SimpleNetworkTest.java
@@ -74,7 +74,7 @@ public class SimpleNetworkTest {
 
     // works b/c of non marshaling vm transport, the connection
     // ref from the client is used during the forward
-    @Test
+    @Test(timeout = 60 * 1000)
     public void testMessageCompression() throws Exception {
 
         ActiveMQConnection localAmqConnection = (ActiveMQConnection) localConnection;
@@ -98,7 +98,7 @@ public class SimpleNetworkTest {
         assertNull(consumer1.receive(1000));
     }
 
-    @Test
+    @Test(timeout = 60 * 1000)
     public void testRequestReply() throws Exception {
         final MessageProducer remoteProducer = remoteSession.createProducer(null);
         MessageConsumer remoteConsumer = remoteSession.createConsumer(included);
@@ -130,7 +130,7 @@ public class SimpleNetworkTest {
         }
     }
 
-    @Test
+    @Test(timeout = 60 * 1000)
     public void testFiltering() throws Exception {
         MessageConsumer includedConsumer = remoteSession.createConsumer(included);
         MessageConsumer excludedConsumer = remoteSession.createConsumer(excluded);
@@ -145,7 +145,7 @@ public class SimpleNetworkTest {
         assertNotNull(includedConsumer.receive(1000));
     }
 
-    @Test
+    @Test(timeout = 60 * 1000)
     public void testConduitBridge() throws Exception {
         MessageConsumer consumer1 = remoteSession.createConsumer(included);
         MessageConsumer consumer2 = remoteSession.createConsumer(included);
@@ -189,7 +189,7 @@ public class SimpleNetworkTest {
         }));
     }
 
-    @Test
+    @Test(timeout = 60 * 1000)
     public void testDurableStoreAndForward() throws Exception {
         // create a remote durable consumer
         MessageConsumer remoteConsumer = remoteSession.createDurableSubscriber(included,
consumerName);


Mime
View raw message