You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ta...@apache.org on 2015/10/26 16:25:39 UTC
qpid-jms git commit: QPIDJMS-125 Fix intermittent test failure.
Repository: qpid-jms
Updated Branches:
refs/heads/master 3b1dd1f3a -> d219a5c1f
QPIDJMS-125 Fix intermittent test failure.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/d219a5c1
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/d219a5c1
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/d219a5c1
Branch: refs/heads/master
Commit: d219a5c1f13d0b32297218c786a0b9fcccb1e927
Parents: 3b1dd1f
Author: Timothy Bish <ta...@gmail.com>
Authored: Mon Oct 26 11:25:24 2015 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Mon Oct 26 11:25:24 2015 -0400
----------------------------------------------------------------------
.../qpid/jms/integration/TransactionsIntegrationTest.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/d219a5c1/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/TransactionsIntegrationTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/TransactionsIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/TransactionsIntegrationTest.java
index a43be96..2ef7046 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/TransactionsIntegrationTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/TransactionsIntegrationTest.java
@@ -400,6 +400,13 @@ public class TransactionsIntegrationTest extends QpidJmsTestCase {
if (closeConsumer && !closeBeforeCommit) {
testPeer.expectDetach(true, true, true);
+
+ // Expect the messages that were not consumed to be released
+ int unconsumed = transferCount - consumeCount;
+ for (int i = 1; i <= unconsumed; i++) {
+ testPeer.expectDispositionThatIsReleasedAndSettled();
+ }
+
messageConsumer.close();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org