[activemq-artemis] branch master updated: NO-JIRA intermittent failure fix

[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 9641984  NO-JIRA intermittent failure fix
9641984 is described below

commit 964198494b3ca1f734e680e8a4ab95ebde580b65
Author: Clebert Suconic <clebertsuco...@apache.org>
AuthorDate: Mon Apr 20 19:23:39 2020 -0400

    NO-JIRA intermittent failure fix
---
 .../integration/management/ActiveMQServerControlTest.java    | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
index a18f0f6..80f164a 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
@@ -85,9 +85,12 @@ import 
org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
 import 
org.apache.activemq.artemis.tests.unit.core.config.impl.fakes.FakeConnectorServiceFactory;
 import org.apache.activemq.artemis.tests.util.Wait;
 import org.apache.activemq.artemis.utils.RandomUtil;
+import org.apache.activemq.artemis.utils.RetryMethod;
+import org.apache.activemq.artemis.utils.RetryRule;
 import org.apache.activemq.artemis.utils.UUIDGenerator;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -97,6 +100,10 @@ import static 
org.apache.activemq.artemis.jms.client.ActiveMQConnection.JMS_SESS
 @RunWith(Parameterized.class)
 public class ActiveMQServerControlTest extends ManagementTestBase {
 
+
+   @Rule
+   public RetryRule retryRule = new RetryRule(0);
+
    // Constants -----------------------------------------------------
 
    // Attributes ----------------------------------------------------
@@ -3069,6 +3076,7 @@ public class ActiveMQServerControlTest extends 
ManagementTestBase {
       }
    }
 
+   @RetryMethod(retries = 2) // the list of connections eventually comes from 
a hashmap on a different order. Which is fine but makes the test fail. a Retry 
is ok
    @Test
    public void testListConnections() throws Exception {
       SimpleString queueName1 = new SimpleString("my_queue_one");
@@ -3092,9 +3100,9 @@ public class ActiveMQServerControlTest extends 
ManagementTestBase {
 
          //sleep as test compares creationTime
          csf = (ClientSessionFactoryImpl) createSessionFactory(locator);
-         Thread.sleep(500);
+         Thread.sleep(50);
          csf2 = (ClientSessionFactoryImpl) createSessionFactory(locator);
-         Thread.sleep(500);
+         Thread.sleep(50);
          csf3 = (ClientSessionFactoryImpl) createSessionFactory(locator);
 
          ClientSession session1_c1 = csf.createSession("guest", "guest", 
false, true, true, locator.isPreAcknowledge(), locator.getAckBatchSize());