You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by lq...@apache.org on 2017/05/15 10:52:23 UTC

qpid-broker-j git commit: NO-JIRA: make test pass with Qpid JMS 0.23

Repository: qpid-broker-j
Updated Branches:
  refs/heads/master dc7dca5f8 -> a5b0f7761


NO-JIRA: make test pass with Qpid JMS 0.23

Qpid JMS 0.23 changed its prefetch behaviour (QPIDJMS-292).
The test remains flaky because it is up to the client to decide when to issue more credit.


Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/a5b0f776
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/a5b0f776
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/a5b0f776

Branch: refs/heads/master
Commit: a5b0f7761fb82730f119c769be371ecc1a384e59
Parents: dc7dca5
Author: Lorenz Quack <lq...@apache.org>
Authored: Mon May 15 11:48:38 2017 +0100
Committer: Lorenz Quack <lq...@apache.org>
Committed: Mon May 15 11:48:38 2017 +0100

----------------------------------------------------------------------
 .../qpid/server/logging/ConsumerLoggingTest.java       | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/a5b0f776/systests/src/test/java/org/apache/qpid/server/logging/ConsumerLoggingTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/server/logging/ConsumerLoggingTest.java b/systests/src/test/java/org/apache/qpid/server/logging/ConsumerLoggingTest.java
index dbbcefc..af8edf4 100644
--- a/systests/src/test/java/org/apache/qpid/server/logging/ConsumerLoggingTest.java
+++ b/systests/src/test/java/org/apache/qpid/server/logging/ConsumerLoggingTest.java
@@ -328,12 +328,13 @@ public class ConsumerLoggingTest extends AbstractTestLogging
 
         assertTrue("Expected at least two suspension messages, but got " + results.size(), results.size() >= 2);
 
-        // Retrieve the first message, and start the flow of messages
-        Message msg = consumer.receive(1000);
-        assertNotNull("Message not retrieved", msg);
-        _session.commit();
-        msg = consumer.receive(1000);
-        assertNotNull("Message not retrieved", msg);
+        // consume all messages to hopefully resume the consumer
+        Message msg;
+        for (int i = 0; i < SEND_COUNT; ++i)
+        {
+            msg = consumer.receive(1000);
+            assertNotNull("Message not retrieved", msg);
+        }
         _session.commit();
 
         int count = waitAndFindMatches("SUB-1003").size();


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