[activemq-artemis] branch master updated: ARTEMIS-2659 Fixing intermittent failures

[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 1932cfc  ARTEMIS-2659 Fixing intermittent failures
     new f78fe47  This closes #3072
1932cfc is described below

commit 1932cfc818a96d62201e409b2ecbfa1ab3fc0d9d
Author: Clebert Suconic <clebertsuco...@apache.org>
AuthorDate: Wed Apr 8 11:34:05 2020 -0400

    ARTEMIS-2659 Fixing intermittent failures
---
 .../tests/integration/amqp/AmqpInboundConnectionTest.java     |  8 ++++----
 .../tests/integration/amqp/AmqpMessagePriorityTest.java       |  3 ++-
 .../amqp/largemessages/AMQPLargeMessagesTestUtil.java         | 11 ++++++++++-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpInboundConnectionTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpInboundConnectionTest.java
index 099af9e..aca1cda 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpInboundConnectionTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpInboundConnectionTest.java
@@ -208,16 +208,16 @@ public class AmqpInboundConnectionTest extends 
AmqpClientTestSupport {
       connection2.setContainerId(getTestName() + "-Client:2");
 
       connection1.connect();
-      assertEquals(1, server.getConnectionCount());
+      Wait.assertEquals(1, server::getConnectionCount);
 
       connection2.connect();
-      assertEquals(2, server.getConnectionCount());
+      Wait.assertEquals(2, server::getConnectionCount);
 
       connection1.close();
-      assertEquals(1, server.getConnectionCount());
+      Wait.assertEquals(1, server::getConnectionCount);
 
       connection2.close();
-      assertEquals(0, server.getConnectionCount());
+      Wait.assertEquals(0, server::getConnectionCount);
    }
 
    @Test(timeout = 60000)
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpMessagePriorityTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpMessagePriorityTest.java
index 097d9bf..62de3b0 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpMessagePriorityTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpMessagePriorityTest.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.tests.util.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;
@@ -233,7 +234,7 @@ public class AmqpMessagePriorityTest extends 
AmqpClientTestSupport {
       }
       receiver.close();
 
-      assertEquals(0, queueView.getMessageCount());
+      Wait.assertEquals(0, queueView::getMessageCount);
 
       connection.close();
    }
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/largemessages/AMQPLargeMessagesTestUtil.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/largemessages/AMQPLargeMessagesTestUtil.java
index 769172f..3795046 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/largemessages/AMQPLargeMessagesTestUtil.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/largemessages/AMQPLargeMessagesTestUtil.java
@@ -17,6 +17,8 @@
 
 package org.apache.activemq.artemis.tests.integration.amqp.largemessages;
 
+import java.util.NoSuchElementException;
+
 import org.apache.activemq.artemis.core.postoffice.Binding;
 import org.apache.activemq.artemis.core.postoffice.QueueBinding;
 import org.apache.activemq.artemis.core.server.ActiveMQServer;
@@ -41,7 +43,14 @@ public class AMQPLargeMessagesTestUtil {
    public static void validateTemporaryBuffers(Queue serverQueue) {
       LinkedListIterator<MessageReference> totalIterator = 
serverQueue.browserIterator();
       while (totalIterator.hasNext()) {
-         MessageReference ref = totalIterator.next();
+         MessageReference ref;
+         try {
+            ref = totalIterator.next();
+         } catch (NoSuchElementException e) {
+            // that's fine, it means the iterator got to the end of the list
+            // and something else removed it
+            break;
+         }
          if (ref.getMessage() instanceof AMQPLargeMessage) {
             AMQPLargeMessage amqpLargeMessage = (AMQPLargeMessage) 
ref.getMessage();
             // Using a Wait.waitFor here as we may have something working with 
the buffer in parallel