This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push: new 1e8b5cbd72 NO-JIRA Adding retry on console tests 1e8b5cbd72 is described below commit 1e8b5cbd7283cd3b81798f1737ba5d212fc6e1d9 Author: Clebert Suconic <clebertsuco...@apache.org> AuthorDate: Thu May 18 11:07:27 2023 -0400 NO-JIRA Adding retry on console tests --- .../activemq/artemis/tests/smoke/console/ConsoleMutualSSLTest.java | 5 +++++ .../org/apache/activemq/artemis/tests/smoke/console/ConsoleTest.java | 5 +++++ .../org/apache/activemq/artemis/tests/smoke/console/LoginTest.java | 5 +++++ .../org/apache/activemq/artemis/tests/smoke/console/QueuesTest.java | 5 +++++ .../org/apache/activemq/artemis/tests/smoke/console/RootTest.java | 5 +++++ .../org/apache/activemq/artemis/tests/smoke/console/TabsTest.java | 5 +++++ 6 files changed, 30 insertions(+) diff --git a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/ConsoleMutualSSLTest.java b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/ConsoleMutualSSLTest.java index 1d287f7c3a..4aebcf8f2e 100644 --- a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/ConsoleMutualSSLTest.java +++ b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/ConsoleMutualSSLTest.java @@ -19,12 +19,14 @@ package org.apache.activemq.artemis.tests.smoke.console; import com.github.dockerjava.zerodep.shaded.org.apache.hc.core5.ssl.SSLContexts; import org.apache.activemq.artemis.tests.smoke.common.SmokeTestBase; import org.apache.activemq.artemis.util.ServerUtil; +import org.apache.activemq.artemis.utils.RetryRule; import org.apache.activemq.artemis.utils.Wait; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; import javax.net.ssl.SSLContext; @@ -32,6 +34,9 @@ import java.io.File; public class ConsoleMutualSSLTest extends SmokeTestBase { + @Rule + public RetryRule retryRule = new RetryRule(2); + protected static final String SERVER_NAME = "console-mutual-ssl"; protected static final String SERVER_ADMIN_USERNAME = "admin"; protected static final String SERVER_ADMIN_PASSWORD = "admin"; diff --git a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/ConsoleTest.java b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/ConsoleTest.java index 74c57438ea..f5d941a288 100644 --- a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/ConsoleTest.java +++ b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/ConsoleTest.java @@ -29,9 +29,11 @@ import java.util.function.Function; import org.apache.activemq.artemis.cli.commands.Create; import org.apache.activemq.artemis.tests.smoke.common.SmokeTestBase; import org.apache.activemq.artemis.util.ServerUtil; +import org.apache.activemq.artemis.utils.RetryRule; import org.junit.After; import org.junit.Assume; import org.junit.Before; +import org.junit.Rule; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.openqa.selenium.MutableCapabilities; @@ -51,6 +53,9 @@ import org.testcontainers.shaded.org.apache.commons.io.FileUtils; @RunWith(Parameterized.class) public abstract class ConsoleTest extends SmokeTestBase { + @Rule + public RetryRule retryRule = new RetryRule(2); + private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); protected static final String SERVER_NAME = "console"; diff --git a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/LoginTest.java b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/LoginTest.java index 66d95b6188..e857eb164f 100644 --- a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/LoginTest.java +++ b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/LoginTest.java @@ -17,11 +17,16 @@ package org.apache.activemq.artemis.tests.smoke.console; import org.apache.activemq.artemis.tests.smoke.console.pages.LoginPage; +import org.apache.activemq.artemis.utils.RetryRule; +import org.junit.Rule; import org.junit.Test; import org.openqa.selenium.MutableCapabilities; public class LoginTest extends ConsoleTest { + @Rule + public RetryRule retryRule = new RetryRule(2); + private static final String DEFAULT_CONSOLE_LOGIN_BRAND_IMAGE = "/activemq-branding/plugin/img/activemq.png"; public LoginTest(MutableCapabilities browserOptions) { diff --git a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/QueuesTest.java b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/QueuesTest.java index e0fe5a0eac..bf3df95e62 100644 --- a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/QueuesTest.java +++ b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/QueuesTest.java @@ -29,8 +29,10 @@ import org.apache.activemq.artemis.tests.smoke.console.pages.QueuePage; import org.apache.activemq.artemis.tests.smoke.console.pages.QueuesPage; import org.apache.activemq.artemis.tests.smoke.console.pages.SendMessagePage; import org.apache.activemq.artemis.tests.smoke.console.pages.StatusPage; +import org.apache.activemq.artemis.utils.RetryRule; import org.apache.activemq.artemis.utils.Wait; import org.junit.Assert; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -41,6 +43,9 @@ import javax.management.ObjectName; @RunWith(Parameterized.class) public class QueuesTest extends ConsoleTest { + @Rule + public RetryRule retryRule = new RetryRule(2); + public QueuesTest(MutableCapabilities browserOptions) { super(browserOptions); } diff --git a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/RootTest.java b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/RootTest.java index 8a4a18a518..ab695a615a 100644 --- a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/RootTest.java +++ b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/RootTest.java @@ -16,12 +16,17 @@ */ package org.apache.activemq.artemis.tests.smoke.console; +import org.apache.activemq.artemis.utils.RetryRule; import org.junit.Assert; +import org.junit.Rule; import org.junit.Test; import org.openqa.selenium.MutableCapabilities; public class RootTest extends ConsoleTest { + @Rule + public RetryRule retryRule = new RetryRule(2); + public RootTest(MutableCapabilities browserOptions) { super(browserOptions); } diff --git a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/TabsTest.java b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/TabsTest.java index 32b3d5a615..f0feaf30fb 100644 --- a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/TabsTest.java +++ b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/TabsTest.java @@ -17,6 +17,8 @@ package org.apache.activemq.artemis.tests.smoke.console; import org.apache.activemq.artemis.tests.smoke.console.pages.LoginPage; +import org.apache.activemq.artemis.utils.RetryRule; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -27,6 +29,9 @@ import org.openqa.selenium.NoSuchElementException; @RunWith(Parameterized.class) public class TabsTest extends ConsoleTest { + @Rule + public RetryRule retryRule = new RetryRule(2); + public TabsTest(MutableCapabilities browserOptions) { super(browserOptions); }