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/09 16:37:47 UTC
qpid-jms git commit: NO-JIRA Fix a test to be more tolerate of slow
CI. Stop another test from calling recover on incoming messages after we've
assumed things have passed and started shutting down to remove some log spam.
Repository: qpid-jms
Updated Branches:
refs/heads/master f259db7ee -> 65734d2d9
NO-JIRA Fix a test to be more tolerate of slow CI. Stop another test
from calling recover on incoming messages after we've assumed things
have passed and started shutting down to remove some log spam.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/65734d2d
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/65734d2d
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/65734d2d
Branch: refs/heads/master
Commit: 65734d2d9b33d4d5a2d7e60716cce20f50c67c62
Parents: f259db7
Author: Timothy Bish <ta...@gmail.com>
Authored: Fri Oct 9 10:37:07 2015 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Fri Oct 9 10:37:07 2015 -0400
----------------------------------------------------------------------
.../org/apache/qpid/jms/consumer/JmsClientAckTest.java | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/65734d2d/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsClientAckTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsClientAckTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsClientAckTest.java
index 3b16306..7e20d9c 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsClientAckTest.java
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsClientAckTest.java
@@ -266,7 +266,13 @@ public class JmsClientAckTest extends AmqpTestSupport {
assertTrue("Failed to consume all messages.", done.await(20, TimeUnit.SECONDS));
assertNotNull(lastMessage.get());
- assertEquals(MSG_COUNT, proxy.getInFlightCount());
+ assertTrue("Not all messages appear as in-flight.", Wait.waitFor(new Wait.Condition() {
+
+ @Override
+ public boolean isSatisified() throws Exception {
+ return proxy.getInFlightCount() == MSG_COUNT;
+ }
+ }));
lastMessage.get().acknowledge();
@@ -388,7 +394,9 @@ public class JmsClientAckTest extends AmqpTestSupport {
redelivery.countDown();
}
LOG.info("calling recover() on the session to force redelivery.");
- session.recover();
+ if (redelivery.getCount() != 0) {
+ session.recover();
+ }
} catch (JMSException e) {
e.printStackTrace();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org