Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AMQ-6979 - fix test regression dependent on serial excution of expiry processing across destinations

This commit is contained in:
gtully 2018-05-31 13:12:38 +01:00
parent 51ec4590eb
commit 4521f47e36
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/DeadLetterExpiryTest.java
View File

@ -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;
}