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 101db39d46a3bff8eef2f52dac84d451e79b2f4e Author: Clebert Suconic <[email protected]> AuthorDate: Tue Apr 21 21:34:53 2020 -0400 NO-JIRA Fixing intermittent failures --- .../cluster/failover/QuorumFailOverTest.java | 3 +-- .../integration/management/QueueControlTest.java | 21 +++++++++++++-------- .../integration/persistence/DuplicateCacheTest.java | 5 +++++ .../plugin/FederationBrokerPluginTest.java | 4 ++++ 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/QuorumFailOverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/QuorumFailOverTest.java index bd7e691..7eee3df 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/QuorumFailOverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/QuorumFailOverTest.java @@ -37,7 +37,7 @@ import org.junit.Test; public class QuorumFailOverTest extends StaticClusterWithBackupFailoverTest { @Rule - public RetryRule retryRule = new RetryRule(0); + public RetryRule retryRule = new RetryRule(2); @Override protected void setupServers() throws Exception { @@ -56,7 +56,6 @@ public class QuorumFailOverTest extends StaticClusterWithBackupFailoverTest { } - @RetryMethod(retries = 2) @Test public void testQuorumVoting() throws Exception { int[] liveServerIDs = new int[]{0, 1, 2}; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java index f220d6b..5fbe5df 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java @@ -73,8 +73,10 @@ import org.apache.activemq.artemis.tests.integration.jms.server.management.JMSUt import org.apache.activemq.artemis.tests.util.Wait; import org.apache.activemq.artemis.utils.Base64; import org.apache.activemq.artemis.utils.RandomUtil; +import org.apache.activemq.artemis.utils.RetryRule; 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; @@ -85,6 +87,9 @@ import static org.apache.activemq.artemis.core.management.impl.openmbean.Composi @RunWith(value = Parameterized.class) public class QueueControlTest extends ManagementTestBase { + @Rule + public RetryRule retryRule = new RetryRule(2); + private ActiveMQServer server; private ClientSession session; private ServerLocator locator; @@ -274,10 +279,10 @@ public class QueueControlTest extends ManagementTestBase { Assert.assertEquals(0, queueControl.getConsumerCount()); ClientConsumer consumer = session.createConsumer(queue); - Assert.assertEquals(1, queueControl.getConsumerCount()); + Wait.assertEquals(1, () -> queueControl.getConsumerCount()); consumer.close(); - Assert.assertEquals(0, queueControl.getConsumerCount()); + Wait.assertEquals(0, () -> queueControl.getConsumerCount()); session.deleteQueue(queue); } @@ -291,10 +296,10 @@ public class QueueControlTest extends ManagementTestBase { QueueControl queueControl = createManagementControl(address, queue); - Assert.assertEquals(0, queueControl.getConsumerCount()); + Wait.assertEquals(0, () -> queueControl.getConsumerCount()); ClientConsumer consumer = session.createConsumer(queue); - Assert.assertEquals(1, queueControl.getConsumerCount()); + Wait.assertEquals(1, () -> queueControl.getConsumerCount()); System.out.println("Consumers: " + queueControl.listConsumersAsJSON()); @@ -376,9 +381,9 @@ public class QueueControlTest extends ManagementTestBase { ClientProducer producer = session.createProducer(address); producer.send(session.createMessage(durable)); - Assert.assertEquals(1, getMessagesAdded(queueControl)); + Wait.assertEquals(1, () -> getMessagesAdded(queueControl)); producer.send(session.createMessage(durable)); - Assert.assertEquals(2, getMessagesAdded(queueControl)); + Wait.assertEquals(2, () -> getMessagesAdded(queueControl)); consumeMessages(2, session, queue); @@ -400,10 +405,10 @@ public class QueueControlTest extends ManagementTestBase { ClientProducer producer = session.createProducer(address); producer.send(session.createMessage(false)); consumeMessages(1, session, queue); - Assert.assertEquals(1, queueControl.getMessagesAcknowledged()); + Wait.assertEquals(1, () -> queueControl.getMessagesAcknowledged()); producer.send(session.createMessage(false)); consumeMessages(1, session, queue); - Assert.assertEquals(2, queueControl.getMessagesAcknowledged()); + Wait.assertEquals(2, () -> queueControl.getMessagesAcknowledged()); // ManagementTestBase.consumeMessages(2, session, queue); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DuplicateCacheTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DuplicateCacheTest.java index 5951906..8300bdb 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DuplicateCacheTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DuplicateCacheTest.java @@ -27,12 +27,17 @@ import org.apache.activemq.artemis.core.postoffice.DuplicateIDCache; import org.apache.activemq.artemis.core.postoffice.impl.DuplicateIDCacheImpl; import org.apache.activemq.artemis.core.transaction.impl.TransactionImpl; import org.apache.activemq.artemis.utils.RandomUtil; +import org.apache.activemq.artemis.utils.RetryRule; import org.junit.After; import org.junit.Assert; +import org.junit.Rule; import org.junit.Test; public class DuplicateCacheTest extends StorageManagerTestBase { + @Rule + public RetryRule retryRule = new RetryRule(2); + public DuplicateCacheTest(StoreConfiguration.StoreType storeType) { super(storeType); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/plugin/FederationBrokerPluginTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/plugin/FederationBrokerPluginTest.java index 02a5cd4..ebcb29c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/plugin/FederationBrokerPluginTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/plugin/FederationBrokerPluginTest.java @@ -35,7 +35,9 @@ import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; import org.apache.activemq.artemis.tests.integration.federation.FederatedTestBase; import org.apache.activemq.artemis.tests.integration.federation.FederatedTestUtil; 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; import static org.apache.activemq.artemis.tests.integration.plugin.MethodCalledVerifier.AFTER_CLOSE_FEDERATED_QUEUE_CONSUMER; @@ -51,6 +53,8 @@ import static org.apache.activemq.artemis.tests.integration.plugin.MethodCalledV public class FederationBrokerPluginTest extends FederatedTestBase { + @Rule + public RetryRule retryRule = new RetryRule(2); private final Map<String, AtomicInteger> methodCalls = new HashMap<>(); private final MethodCalledVerifier verifier0 = new MethodCalledVerifier(methodCalls);
