[activemq-artemis] branch master updated: ARTEMIS-2659: address some more sporadic test failures due to races in tests

[ta...@apache.org]

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

tabish 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 17b5b09  ARTEMIS-2659: address some more sporadic test failures due to races in tests
     new 0a4ec3c  This closes #3077
17b5b09 is described below

commit 17b5b09b466e6b46544e7b6cdbef59ef4c5323f4
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Mon Apr 13 16:11:36 2020 +0100

    ARTEMIS-2659: address some more sporadic test failures due to races in tests
---
 .../artemis/tests/integration/amqp/AmqpDeliveryAnnotationsTest.java   | 3 ++-
 .../artemis/tests/integration/amqp/AmqpReceiverPriorityTest.java      | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpDeliveryAnnotationsTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpDeliveryAnnotationsTest.java
index 61787dd..833b958 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpDeliveryAnnotationsTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpDeliveryAnnotationsTest.java
@@ -19,6 +19,7 @@ package org.apache.activemq.artemis.tests.integration.amqp;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.utils.Wait;
 import org.apache.activemq.transport.amqp.client.AmqpClient;
 import org.apache.activemq.transport.amqp.client.AmqpConnection;
 import org.apache.activemq.transport.amqp.client.AmqpMessage;
@@ -52,7 +53,7 @@ public class AmqpDeliveryAnnotationsTest extends AmqpClientTestSupport {
       receiver.flow(1);
 
       Queue queue = getProxyToQueue(getQueueName());
-      assertEquals(1, queue.getMessageCount());
+      Wait.assertEquals(1L, queue::getMessageCount, 5000L, 25L);
 
       AmqpMessage received = receiver.receive(5, TimeUnit.SECONDS);
       assertNotNull(received);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpReceiverPriorityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpReceiverPriorityTest.java
index 95011d3..736c7ca 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpReceiverPriorityTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpReceiverPriorityTest.java
@@ -124,8 +124,8 @@ public class AmqpReceiverPriorityTest extends AmqpClientTestSupport {
 
 
       for (int i = 0; i < 2; i++) {
-         AmqpMessage message1 = receiver1.receiveNoWait();
-         assertNotNull("did not receive message first time", message1);
+         AmqpMessage message1 = receiver1.receive(3000, TimeUnit.MILLISECONDS);
+         assertNotNull("did not receive message" + i, message1);
          assertEquals("MessageID:" + i, message1.getMessageId());
          message1.accept();
       }