You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ke...@apache.org on 2014/09/29 14:48:05 UTC
git commit: Added timeouts to prevent hangs during CI builds
Repository: activemq
Updated Branches:
refs/heads/trunk 8f138473d -> 025c2316d
Added timeouts to prevent hangs during CI builds
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/025c2316
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/025c2316
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/025c2316
Branch: refs/heads/trunk
Commit: 025c2316d9c12afc3e39df2a66ce8e2576c728b2
Parents: 8f13847
Author: Kevin Earls <ke...@kevinearls.com>
Authored: Mon Sep 29 14:47:54 2014 +0200
Committer: Kevin Earls <ke...@kevinearls.com>
Committed: Mon Sep 29 14:47:54 2014 +0200
----------------------------------------------------------------------
.../org/apache/activemq/transport/amqp/AmqpTransformerTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/025c2316/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTransformerTest.java
----------------------------------------------------------------------
diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTransformerTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTransformerTest.java
index 3b4aecf..9a8b3f6 100644
--- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTransformerTest.java
+++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTransformerTest.java
@@ -52,7 +52,7 @@ public class AmqpTransformerTest {
private int openwirePort;
private static final String TEST_QUEUE = "txqueue";
- @Test
+ @Test(timeout=60 * 1000)
public void testNativeTransformation() throws Exception {
// default is native
@@ -149,7 +149,7 @@ public class AmqpTransformerTest {
openwireConn.close();
}
- @Test
+ @Test(timeout=60 * 1000)
public void testJmsTransformation() throws Exception {
// default is native