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
commit daeec3e7ab6f8752a4bfaaaa2a1345ae72051252 Author: Clebert Suconic <[email protected]> AuthorDate: Tue Apr 21 13:56:48 2020 -0400 NO-JIRA intermittent failures --- .../tests/integration/federation/FederatedQueueTest.java | 11 +++++++++-- .../security/LegacyLDAPSecuritySettingPluginTest2.java | 3 --- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/federation/FederatedQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/federation/FederatedQueueTest.java index 5af8de1..1b5b814 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/federation/FederatedQueueTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/federation/FederatedQueueTest.java @@ -36,7 +36,9 @@ import org.apache.activemq.artemis.core.server.transformer.Transformer; import org.apache.activemq.artemis.core.settings.impl.AddressSettings; import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; import org.apache.activemq.artemis.tests.util.Wait; +import org.apache.activemq.artemis.utils.RetryRule; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; /** @@ -45,6 +47,11 @@ import org.junit.Test; public class FederatedQueueTest extends FederatedTestBase { + // I could not make this test to fail locally even after many retries + // however I have seen eventually failures on the CI + @Rule + public RetryRule retryRule = new RetryRule(1); + @Override @Before public void setUp() throws Exception { @@ -114,10 +121,10 @@ public class FederatedQueueTest extends FederatedTestBase { Queue queue0 = session0.createQueue(queueName); Queue queue1 = session1.createQueue(queueName); - MessageConsumer consumer0 = session0.createConsumer(queue0); MessageConsumer consumer1 = session1.createConsumer(queue1); + Wait.waitFor(() -> getConsumerCount(getServer(1), queueName, 1)); - + MessageConsumer consumer0 = session0.createConsumer(queue0); Wait.waitFor(() -> getConsumerCount(getServer(1), queueName, 2)); MessageProducer producer1 = session1.createProducer(queue1); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/LegacyLDAPSecuritySettingPluginTest2.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/LegacyLDAPSecuritySettingPluginTest2.java index 6376819..69b4a93 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/LegacyLDAPSecuritySettingPluginTest2.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/LegacyLDAPSecuritySettingPluginTest2.java @@ -45,7 +45,6 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; import org.apache.activemq.artemis.core.server.impl.LegacyLDAPSecuritySettingPlugin; import org.apache.activemq.artemis.spi.core.security.ActiveMQJAASSecurityManager; -import org.apache.activemq.artemis.spi.core.security.jaas.LDAPLoginModule; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.directory.server.annotations.CreateLdapServer; import org.apache.directory.server.annotations.CreateTransport; @@ -159,8 +158,6 @@ public class LegacyLDAPSecuritySettingPluginTest2 extends AbstractLdapTestUnit { @Test public void testBasicPluginAuthorization() throws Exception { - org.jboss.logmanager.Logger.getLogger(LDAPLoginModule.class.getName()).setLevel(org.jboss.logmanager.Level.DEBUG); - org.jboss.logmanager.Logger.getLogger(LegacyLDAPSecuritySettingPlugin.class.getName()).setLevel(org.jboss.logmanager.Level.DEBUG); server.start(); ClientSessionFactory cf = locator.createSessionFactory(); String name = "TEST.FOO";
