[activemq-artemis] branch master updated: NO-JIRA Avoiding intermittent failures on BridgeTest

[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 a084e5b  NO-JIRA Avoiding intermittent failures on BridgeTest
a084e5b is described below

commit a084e5b37f7a7a808fd4fe95fa1628834151860e
Author: Clebert Suconic <clebertsuco...@apache.org>
AuthorDate: Wed Apr 8 22:27:37 2020 -0400

    NO-JIRA Avoiding intermittent failures on BridgeTest
---
 .../tests/integration/cluster/bridge/BridgeTest.java  | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java
index c6d6fa6..3c8b5c2 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java
@@ -1762,7 +1762,7 @@ public class BridgeTest extends ActiveMQTestBase {
          ArrayList<String> staticConnectors = new ArrayList<>();
          staticConnectors.add(server1tc.getName());
 
-         int minLargeMessageSize = 1024 * 1024;
+         int minLargeMessageSize = 200 * 1024;
 
          BridgeConfiguration bridgeConfiguration = new 
BridgeConfiguration().setName("bridge1").setQueueName(queueName0).setForwardingAddress(forwardAddress).setRetryInterval(1000).setReconnectAttemptsOnSameNode(-1).setUseDuplicateDetection(false).setConfirmationWindowSize(1024).setStaticConnectors(staticConnectors).setMinLargeMessageSize(minLargeMessageSize).setProducerWindowSize(minLargeMessageSize
 / 2);
 
@@ -1800,7 +1800,7 @@ public class BridgeTest extends ActiveMQTestBase {
          session1.start();
 
          //create a large message bigger than Integer.MAX_VALUE
-         final long largeMessageSize = Integer.MAX_VALUE + 1000L;
+         final long largeMessageSize = 200 * 1024;
 
          ClientMessage largeMessage = createLargeMessage(session0, 
largeMessageSize);
 
@@ -1809,20 +1809,7 @@ public class BridgeTest extends ActiveMQTestBase {
          session0.commit();
 
          //check target queue for large message arriving
-         ClientSession.QueueQuery query = session1.queueQuery(new 
SimpleString(queueName1));
-         long messageCount = query.getMessageCount();
-         int count = 0;
-         //wait for 300 sec max
-         while (messageCount == 0 && count < 300) {
-            count++;
-            Thread.sleep(1000);
-            query = session1.queueQuery(new SimpleString(queueName1));
-            messageCount = query.getMessageCount();
-         }
-
-         if (messageCount == 0) {
-            fail("large message didn't arrived after 5 min!");
-         }
+         Wait.waitFor(() -> 
session1.queueQuery(SimpleString.toSimpleString(queueName1)).getMessageCount() 
> 0);
 
          //receive the message
          ClientMessage message = consumer1.receive(5000);