From e86acc977b4f0c595156d423724d44624660085c Mon Sep 17 00:00:00 2001
From: Clebert Suconic <clebertsuconic@apache.org>
Date: Tue, 12 Oct 2021 10:23:22 -0400
Subject: [PATCH] NO-JIRA fixing intermittent test failure

---
 .../integration/server/AutoCreateExpiryResourcesTest.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/AutoCreateExpiryResourcesTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/AutoCreateExpiryResourcesTest.java
index ee88bc6b15..f6168dc6d5 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/AutoCreateExpiryResourcesTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/AutoCreateExpiryResourcesTest.java
@@ -52,11 +52,10 @@ public class AutoCreateExpiryResourcesTest extends ActiveMQTestBase {
    public void setUp() throws Exception {
       super.setUp();
       server = createServer(false);
-      server.getConfiguration().setAddressQueueScanPeriod(100);
+      server.getConfiguration().setAddressQueueScanPeriod(50L).setMessageExpiryScanPeriod(50L);
 
       // set common address settings needed for all tests; make sure to use getMatch instead of addMatch in invidual tests or these will be overwritten
       server.getAddressSettingsRepository().addMatch("#", new AddressSettings().setAutoCreateExpiryResources(true).setExpiryAddress(expiryAddress).setExpiryDelay(EXPIRY_DELAY));
-      server.getConfiguration().setMessageExpiryScanPeriod(50L);
 
       server.start();
    }
@@ -164,9 +163,11 @@ public class AutoCreateExpiryResourcesTest extends ActiveMQTestBase {
       ClientSessionFactory sessionFactory = createSessionFactory(locator);
       ClientSession session = addClientSession(sessionFactory.createSession(true, true));
       Wait.assertTrue(() -> server.locateQueue(expiryQueueName) != null, 2000, 100);
+      Wait.assertEquals(1, server.locateQueue(expiryQueueName) :: getMessageCount);
+
       ClientConsumer consumer = session.createConsumer(expiryQueueName);
       session.start();
-      ClientMessage message = consumer.receive();
+      ClientMessage message = consumer.receive(5_000);
       assertNotNull(message);
       message.acknowledge();
       consumer.close();
@@ -227,6 +228,7 @@ public class AutoCreateExpiryResourcesTest extends ActiveMQTestBase {
       ClientSession session = addClientSession(sessionFactory.createSession(true, false));
       ClientProducer producer = addClientProducer(session.createProducer(addressA));
       ClientMessage message = session.createMessage(true);
+      message.setExpiration(System.currentTimeMillis());
       producer.send(message);
       producer.close();
       session.close();