Repository: activemq Updated Branches: refs/heads/master efa4e683b -> 0e02b678d
no-jira - fix flaky test that can get redelivery on async client ack and concurrent close Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/0e02b678 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/0e02b678 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/0e02b678 Branch: refs/heads/master Commit: 0e02b678d118c4d2e67e35777287a95f1204948c Parents: efa4e68 Author: gtully <[email protected]> Authored: Mon Oct 22 11:21:42 2018 +0100 Committer: gtully <[email protected]> Committed: Mon Oct 22 11:21:42 2018 +0100 ---------------------------------------------------------------------- .../broker/virtual/VirtualTopicDisconnectSelectorTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/0e02b678/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/VirtualTopicDisconnectSelectorTest.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/VirtualTopicDisconnectSelectorTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/VirtualTopicDisconnectSelectorTest.java index cf2c67e..cd8ef81 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/VirtualTopicDisconnectSelectorTest.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/virtual/VirtualTopicDisconnectSelectorTest.java @@ -143,7 +143,10 @@ public class VirtualTopicDisconnectSelectorTest extends EmbeddedBrokerTestSuppor protected void assertMessagesArrived(ConsumerBean messageList, int expected, long timeout) { - messageList.assertMessagesArrived(expected,timeout); + messageList.waitForMessagesToArrive(expected,timeout); + assertTrue("got at least expected num messages, " + + "may be the odd duplicate on clientAck and disconnect outside a tx on separate thread", + messageList.getMessages().size() >= expected); messageList.flushMessages();
