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 2013/11/14 15:33:34 UTC

git commit: Changed timeouts to 1 minute from 30 because of occasional long runs on CI boxes. None of these tests takes more than 5 seconds on my mac

Updated Branches:
  refs/heads/trunk 0a67b12c6 -> e57aeb378


Changed timeouts to 1 minute from 30 because of occasional long runs on CI boxes.  None of these tests takes more than 5 seconds on my mac


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

Branch: refs/heads/trunk
Commit: e57aeb3786e952ec469f4aec80cc3bfd1d00125d
Parents: 0a67b12
Author: Kevin Earls <ke...@kevinearls.com>
Authored: Thu Nov 14 15:33:26 2013 +0100
Committer: Kevin Earls <ke...@kevinearls.com>
Committed: Thu Nov 14 15:33:26 2013 +0100

----------------------------------------------------------------------
 .../activemq/transport/mqtt/MQTTTest.java       | 30 ++++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/e57aeb37/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTTest.java
----------------------------------------------------------------------
diff --git a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTTest.java b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTTest.java
index 61934b6..994be67 100644
--- a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTTest.java
+++ b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTTest.java
@@ -44,7 +44,7 @@ public class MQTTTest extends AbstractMQTTTest {
 
     private static final Logger LOG = LoggerFactory.getLogger(MQTTTest.class);
 
-    @Test(timeout=300000)
+    @Test(timeout=60 * 1000)
     public void testSendAndReceiveMQTT() throws Exception {
         addMQTTConnector();
         brokerService.start();
@@ -88,7 +88,7 @@ public class MQTTTest extends AbstractMQTTTest {
         publishProvider.disconnect();
     }
 
-    @Test(timeout=300000)
+    @Test(timeout=60 * 1000)
     public void testUnsubscribeMQTT() throws Exception {
         addMQTTConnector();
         brokerService.start();
@@ -136,7 +136,7 @@ public class MQTTTest extends AbstractMQTTTest {
         publishProvider.disconnect();
     }
 
-    @Test(timeout=300000)
+    @Test(timeout=60 * 1000)
     public void testSendAtMostOnceReceiveExactlyOnce() throws Exception {
         /**
          * Although subscribing with EXACTLY ONCE, the message gets published
@@ -159,7 +159,7 @@ public class MQTTTest extends AbstractMQTTTest {
         provider.disconnect();
     }
 
-    @Test(timeout=300000)
+    @Test(timeout=60 * 1000)
     public void testSendAtLeastOnceReceiveExactlyOnce() throws Exception {
         addMQTTConnector();
         brokerService.start();
@@ -177,7 +177,7 @@ public class MQTTTest extends AbstractMQTTTest {
         provider.disconnect();
     }
 
-    @Test(timeout=300000)
+    @Test(timeout=60 * 1000)
     public void testSendAtLeastOnceReceiveAtMostOnce() throws Exception {
         addMQTTConnector();
         brokerService.start();
@@ -195,7 +195,7 @@ public class MQTTTest extends AbstractMQTTTest {
         provider.disconnect();
     }
 
-    @Test(timeout=300000)
+    @Test(timeout=60 * 1000)
     public void testSendAndReceiveAtMostOnce() throws Exception {
         addMQTTConnector();
         brokerService.start();
@@ -213,7 +213,7 @@ public class MQTTTest extends AbstractMQTTTest {
         provider.disconnect();
     }
 
-    @Test(timeout=300000)
+    @Test(timeout=60 * 1000)
     public void testSendAndReceiveAtLeastOnce() throws Exception {
         addMQTTConnector();
         brokerService.start();
@@ -231,7 +231,7 @@ public class MQTTTest extends AbstractMQTTTest {
         provider.disconnect();
     }
 
-    @Test(timeout=300000)
+    @Test(timeout=60 * 1000)
     public void testSendAndReceiveExactlyOnce() throws Exception {
         addMQTTConnector();
         brokerService.start();
@@ -253,7 +253,7 @@ public class MQTTTest extends AbstractMQTTTest {
         publisher.disconnect();
     }
 
-    @Test(timeout=300000)
+    @Test(timeout=60 * 1000)
     public void testSendAndReceiveLargeMessages() throws Exception {
         byte[] payload = new byte[1024 * 32];
         for (int i = 0; i < payload.length; i++){
@@ -280,7 +280,7 @@ public class MQTTTest extends AbstractMQTTTest {
         publisher.disconnect();
     }
 
-    @Test(timeout=300000)
+    @Test(timeout=60 * 1000)
     public void testSendMQTTReceiveJMS() throws Exception {
         addMQTTConnector();
         TransportConnector openwireTransport = brokerService.addConnector("tcp://localhost:0");
@@ -309,7 +309,7 @@ public class MQTTTest extends AbstractMQTTTest {
         provider.disconnect();
     }
 
-    @Test(timeout=300000)
+    @Test(timeout=60 * 1000)
     public void testSendJMSReceiveMQTT() throws Exception {
         addMQTTConnector();
         TransportConnector openwireTransport = brokerService.addConnector("tcp://localhost:0");
@@ -337,7 +337,7 @@ public class MQTTTest extends AbstractMQTTTest {
         activeMQConnection.close();
     }
 
-    @Test(timeout=300000)
+    @Test(timeout=60 * 1000)
     public void testPingKeepsInactivityMonitorAlive() throws Exception {
         addMQTTConnector();
         brokerService.start();
@@ -358,7 +358,7 @@ public class MQTTTest extends AbstractMQTTTest {
         connection.disconnect();
     }
 
-    @Test(timeout=300000)
+    @Test(timeout=60 * 1000)
     public void testTurnOffInactivityMonitor()throws Exception{
         addMQTTConnector("transport.useInactivityMonitor=false");
         brokerService.start();
@@ -466,7 +466,7 @@ public class MQTTTest extends AbstractMQTTTest {
         assertEquals("Should have received " + topics.length + " messages", topics.length, received);
     }
 
-    @Test(timeout=300000)
+    @Test(timeout=60 * 1000)
     public void testReceiveMessageSentWhileOffline() throws Exception {
         byte[] payload = new byte[1024 * 32];
         for (int i = 0; i < payload.length; i++){
@@ -560,7 +560,7 @@ public class MQTTTest extends AbstractMQTTTest {
         }));
     }
 
-    @Test(timeout=300000)
+    @Test(timeout=60 * 1000)
     public void testReuseConnection() throws Exception {
         addMQTTConnector();
         brokerService.start();