You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2015/08/20 18:01:11 UTC

qpid-jms git commit: NO-JIRA: increase receive timeouts to be more lenient of slower CI boxes, move assertions to prevent NPE

Repository: qpid-jms
Updated Branches:
  refs/heads/master 776de4c25 -> 250d2ba48


NO-JIRA: increase receive timeouts to be more lenient of slower CI boxes, move assertions to prevent NPE


Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/250d2ba4
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/250d2ba4
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/250d2ba4

Branch: refs/heads/master
Commit: 250d2ba48c1d3bd9eacbe4b8036dc3cad49b0649
Parents: 776de4c
Author: Robert Gemmell <ro...@apache.org>
Authored: Thu Aug 20 16:58:08 2015 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Thu Aug 20 16:59:11 2015 +0100

----------------------------------------------------------------------
 .../jms/failover/JmsTxConsumerFailoverTest.java | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/250d2ba4/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/JmsTxConsumerFailoverTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/JmsTxConsumerFailoverTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/JmsTxConsumerFailoverTest.java
index c698adf..81e8948 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/JmsTxConsumerFailoverTest.java
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/JmsTxConsumerFailoverTest.java
@@ -86,8 +86,8 @@ public class JmsTxConsumerFailoverTest extends AmqpTestSupport {
         }, TimeUnit.SECONDS.toMillis(30), TimeUnit.MILLISECONDS.toMillis(50)));
 
         for (int i = 0; i < MSG_COUNT; ++i) {
-            Message received = consumer.receive(1000);
-            assertNotNull(received);
+            Message received = consumer.receive(3000);
+            assertNotNull("Mesage was not expected but not received", received);
         }
 
         try {
@@ -117,8 +117,8 @@ public class JmsTxConsumerFailoverTest extends AmqpTestSupport {
         assertEquals(MSG_COUNT, proxy.getQueueSize());
 
         for (int i = 0; i < MSG_COUNT; ++i) {
-            Message received = consumer.receive(1000);
-            assertNotNull(received);
+            Message received = consumer.receive(3000);
+            assertNotNull("Mesage was not expected but not received", received);
         }
 
         stopPrimaryBroker();
@@ -154,8 +154,8 @@ public class JmsTxConsumerFailoverTest extends AmqpTestSupport {
         assertEquals(MSG_COUNT, proxy.getQueueSize());
 
         for (int i = 0; i < MSG_COUNT; ++i) {
-            Message received = consumer.receive(1000);
-            assertNotNull(received);
+            Message received = consumer.receive(3000);
+            assertNotNull("Mesage was not expected but not received", received);
         }
 
         proxy = getProxyToQueue(name.getMethodName());
@@ -198,9 +198,9 @@ public class JmsTxConsumerFailoverTest extends AmqpTestSupport {
         assertEquals(MSG_COUNT, proxy.getQueueSize());
 
         for (int i = 0; i < MSG_COUNT / 2; ++i) {
-            Message received = consumer.receive(1000);
+            Message received = consumer.receive(3000);
+            assertNotNull("Mesage was not expected but not received", received);
             LOG.info("consumer received message #{} - {}", i + 1, received.getJMSMessageID());
-            assertNotNull(received);
         }
 
         assertEquals(MSG_COUNT, proxy.getQueueSize());
@@ -212,9 +212,9 @@ public class JmsTxConsumerFailoverTest extends AmqpTestSupport {
         assertEquals(MSG_COUNT, proxy.getQueueSize());
 
         for (int i = 0; i < MSG_COUNT / 2; ++i) {
-            Message received = consumer.receive(1000);
+            Message received = consumer.receive(3000);
+            assertNotNull("Mesage was not expected but not received", received);
             LOG.info("consumer received message #{} - {}", i + 1, received.getJMSMessageID());
-            assertNotNull(received);
         }
 
         try {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org