[activemq-artemis] branch master updated: NO-JIRA Fixing intermittent failure on QueueAutoDeleteTest

[clebertsuconic]

This is an automated email from the ASF dual-hosted git repository.

clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/master by this push:
     new 7314cc7  NO-JIRA Fixing intermittent failure on QueueAutoDeleteTest
7314cc7 is described below

commit 7314cc7ae9218555a2fb7d8afbe89b070f95ad39
Author: Clebert Suconic <clebertsuco...@apache.org>
AuthorDate: Fri Apr 17 17:26:33 2020 -0400

    NO-JIRA Fixing intermittent failure on QueueAutoDeleteTest
---
 .../integration/jms/client/QueueAutoDeleteTest.java    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/QueueAutoDeleteTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/QueueAutoDeleteTest.java
index df14e4a..adc11a1 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/QueueAutoDeleteTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/QueueAutoDeleteTest.java
@@ -71,6 +71,9 @@ public class QueueAutoDeleteTest extends JMSTestBase {
          Queue queue = session.createQueue(testQueueName + 
"?auto-delete=true");
          ActiveMQDestination activeMQDestination = (ActiveMQDestination) queue;
 
+         final MessageConsumer consumer1 = session.createConsumer(queue);
+
+
          assertEquals(testQueueName, queue.getQueueName());
          assertEquals(true, 
activeMQDestination.getQueueAttributes().getAutoDelete());
          assertEquals(true, 
activeMQDestination.getQueueConfiguration().isAutoDelete());
@@ -83,25 +86,22 @@ public class QueueAutoDeleteTest extends JMSTestBase {
          assertTrue(queueBinding.getQueue().isAutoDelete());
          Wait.assertEquals(2, queueBinding.getQueue()::getMessageCount);
 
-         MessageConsumer consumer = session.createConsumer(queue);
-         Message message = consumer.receive(5000);
+         Message message = consumer1.receive(5000);
          assertNotNull(message);
          message.acknowledge();
 
-         consumer.close();
 
          queueBinding = (QueueBinding) 
server.getPostOffice().getBinding(SimpleString.toSimpleString(testQueueName));
          Wait.assertEquals(1, queueBinding.getQueue()::getMessageCount);
 
-         consumer = session.createConsumer(queue);
-         message = consumer.receive(5000);
+         final MessageConsumer consumer2 = session.createConsumer(queue);
+         consumer1.close();
+
+         message = consumer2.receive(5000);
          assertNotNull(message);
          message.acknowledge();
 
-         consumer.close();
-
-         //Wait longer than scan period.
-         Thread.sleep(20);
+         consumer2.close();
 
          Wait.assertTrue(() -> 
server.getPostOffice().getBinding(SimpleString.toSimpleString(testQueueName)) 
== null, 5000, 10);