Merge pull request wildfly#18640 from rhusar/WFLY-20256

WFLY-20256 MP Health TCK is never run with the security manager
rhusar · Jan 13, 2025 · 0401235 · 0401235
2 parents e5f54e7 + 0d2b71c
commit 0401235
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/testsuite/integration/microprofile-tck/health/src/test/resources/arquillian-bootable.xml b/testsuite/integration/microprofile-tck/health/src/test/resources/arquillian-bootable.xml
@@ -5,19 +5,19 @@
   -->
 
 <arquillian xmlns="http://jboss.org/schema/arquillian" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
+            xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
 
-    <defaultProtocol type="jmx-as7" />
+    <defaultProtocol type="jmx-as7"/>
 
     <container qualifier="jboss" default="true">
         <configuration>
+            <property name="allowConnectingToRunningServer">true</property>
             <property name="installDir">${install.dir}</property>
             <property name="jarFile">${bootable.jar}</property>
-
             <property name="javaVmArguments">${microprofile.jvm.args}</property>
+            <property name="jbossArguments">${jboss.args}</property>
             <property name="managementAddress">127.0.0.1</property>
             <property name="managementPort">9990</property>
-            <property name="allowConnectingToRunningServer">true</property>
             <property name="waitForPorts">9990</property>
             <property name="waitForPortsTimeoutInSeconds">10</property>
         </configuration>

diff --git a/testsuite/integration/microprofile-tck/health/src/test/resources/arquillian.xml b/testsuite/integration/microprofile-tck/health/src/test/resources/arquillian.xml
@@ -7,17 +7,18 @@
 <arquillian xmlns="http://jboss.org/schema/arquillian" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
 
-    <container qualifier="jboss" default="true" >
+    <container qualifier="jboss" default="true">
         <configuration>
-            <property name="jbossHome">${jboss.home}</property>
+            <property name="allowConnectingToRunningServer">true</property>
+            <property name="javaHome">${container.java.home}</property>
             <property name="javaVmArguments">${microprofile.jvm.args}</property>
-            <property name="serverConfig">${jboss.server.config.file.name:standalone-microprofile.xml}</property>
+            <property name="jbossArguments">${jboss.args}</property>
+            <property name="jbossHome">${jboss.home}</property>
             <property name="managementAddress">127.0.0.1</property>
             <property name="managementPort">9990</property>
-            <property name="allowConnectingToRunningServer">true</property>
+            <property name="serverConfig">${jboss.server.config.file.name:standalone-microprofile.xml}</property>
             <property name="waitForPorts">9990</property>
             <property name="waitForPortsTimeoutInSeconds">10</property>
-            <property name="javaHome">${container.java.home}</property>
         </configuration>
     </container>
 </arquillian>