Repository: activemq Updated Branches: refs/heads/master 51ec4590e -> 4521f47e3
AMQ-6979 - fix test regression dependent on serial excution of expiry processing across destinations Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/4521f47e Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/4521f47e Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/4521f47e Branch: refs/heads/master Commit: 4521f47e3691320251e85e886074e3c2a97ae10a Parents: 51ec459 Author: gtully <[email protected]> Authored: Thu May 31 13:12:38 2018 +0100 Committer: gtully <[email protected]> Committed: Thu May 31 13:12:38 2018 +0100 ---------------------------------------------------------------------- .../org/apache/activemq/broker/policy/DeadLetterExpiryTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/4521f47e/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/DeadLetterExpiryTest.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/DeadLetterExpiryTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/DeadLetterExpiryTest.java index 37a6039..94578df 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/DeadLetterExpiryTest.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/DeadLetterExpiryTest.java @@ -36,6 +36,8 @@ import org.apache.activemq.util.Wait; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.concurrent.TimeUnit; + public class DeadLetterExpiryTest extends DeadLetterTest { private static final Logger LOG = LoggerFactory.getLogger(DeadLetterExpiryTest.class); @@ -156,7 +158,8 @@ public class DeadLetterExpiryTest extends DeadLetterTest { try { QueueViewMBean queueViewMBean = getProxyToQueue("DLQ.auditConfigured"); LOG.info("Queue " + queueViewMBean.getName() + ", size:" + queueViewMBean.getQueueSize()); - return queueViewMBean.getQueueSize() == 4; + // expiry across queues is no longer seralised on a single timertask thread AMQ-6979 + return queueViewMBean.getQueueSize() >= 2; } catch (Exception expectedTillExpiry) {} return false; }
