Merge pull request wildfly#18084 from jasondlee/WFLY-19587

[WFLY-19587] Make MP Health tests more resilient
rsearls · Jul 27, 2024 · 099ef5d · 099ef5d
2 parents d0a60ee + 5259432
commit 099ef5d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/...ldfly/test/integration/microprofile/health/MicroProfileHealthApplicationLiveTestBase.java b/...ldfly/test/integration/microprofile/health/MicroProfileHealthApplicationLiveTestBase.java
@@ -28,7 +28,9 @@
 import org.jboss.arquillian.junit.InSequence;
 import org.jboss.arquillian.test.api.ArquillianResource;
 import org.jboss.as.arquillian.api.ContainerResource;
+import org.jboss.as.arquillian.api.ServerSetup;
 import org.jboss.as.arquillian.container.ManagementClient;
+import org.jboss.as.arquillian.setup.ReloadServerSetupTask;
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.StringAsset;
@@ -41,6 +43,7 @@
  */
 @RunWith(Arquillian.class)
 @RunAsClient
+@ServerSetup(ReloadServerSetupTask.class)
 public abstract class MicroProfileHealthApplicationLiveTestBase {
 
     abstract void checkGlobalOutcome(ManagementClient managementClient, String operation, boolean mustBeUP, String probeName) throws IOException;

diff --git a/.../integration/microprofile/health/MicroProfileHealthDisabledDefaultProceduresTestBase.java b/.../integration/microprofile/health/MicroProfileHealthDisabledDefaultProceduresTestBase.java
@@ -5,23 +5,26 @@
 
 package org.wildfly.test.integration.microprofile.health;
 
+import java.io.IOException;
+
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.OperateOnDeployment;
 import org.jboss.arquillian.container.test.api.RunAsClient;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.as.arquillian.api.ContainerResource;
+import org.jboss.as.arquillian.api.ServerSetup;
 import org.jboss.as.arquillian.container.ManagementClient;
+import org.jboss.as.arquillian.setup.ReloadServerSetupTask;
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.StringAsset;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import java.io.IOException;
-
 @RunWith(Arquillian.class)
 @RunAsClient
+@ServerSetup(ReloadServerSetupTask.class)
 public abstract class MicroProfileHealthDisabledDefaultProceduresTestBase {
 
     abstract void checkGlobalOutcome(final ManagementClient managementClient, final String operation, final boolean mustBeUP,