Merge pull request #10026 from fjuma/WFLY-8721

[WFLY-8721] Fix test failures that occur when different values for node0 and node1 are used
wildfly · May 12, 2017 · 27a2e40 · 27a2e40
2 parents 8bed235 + d3c2da7
commit 27a2e40
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/testsuite/domain/src/test/resources/host-configs/host-master-elytron.xml b/testsuite/domain/src/test/resources/host-configs/host-master-elytron.xml
@@ -67,7 +67,7 @@
     </domain-controller>
     <interfaces>
         <interface name="management">
-            <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
+            <inet-address value="${jboss.test.host.master.address}"/>
         </interface>
     </interfaces>
     <jvms>

diff --git a/testsuite/domain/src/test/resources/host-configs/host-slave-elytron.xml b/testsuite/domain/src/test/resources/host-configs/host-slave-elytron.xml
@@ -67,10 +67,10 @@
     </domain-controller>
     <interfaces>
         <interface name="management">
-            <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
+            <inet-address value="${jboss.test.host.slave.address}"/>
         </interface>
         <interface name="public">
-            <inet-address value="${jboss.bind.address:127.0.0.1}"/>
+            <inet-address value="${jboss.test.host.slave.address}"/>
         </interface>
     </interfaces>
     <jvms>

diff --git a/testsuite/integration/manualmode/pom.xml b/testsuite/integration/manualmode/pom.xml
@@ -93,6 +93,7 @@
                             <systemPropertyVariables combine.children="append">
                                 <!--<management.address>${node0}</management.address>-->
                                 <jvm.args>${jvm.args.ip.server} ${modular.jdk.args}</jvm.args>
+                                <server.jvm2.args>${surefire.system.args} ${jvm.args.ip} -Djboss.bind.address=${node1} -Djboss.bind.address.management=${node1} -Djboss.bind.address.unsecure=${node1} -Dnode0=${node0} -Dnode1=${node1} ${modular.jdk.args}</server.jvm2.args>
                                 <arquillian.launch>manual-mode</arquillian.launch>
                                 <jboss.server.config.file.name>standalone-ha.xml</jboss.server.config.file.name>
                                 <!-- needed for SSLEJBRemoteClientTestCase only, however setting them from within the test itself isn't possible -->

diff --git a/testsuite/integration/manualmode/src/test/config/arq/arquillian.xml b/testsuite/integration/manualmode/src/test/config/arq/arquillian.xml
@@ -40,7 +40,7 @@
         <container qualifier="jbossas-with-remote-outbound-connection" default="false" mode="manual">
             <configuration>
                 <property name="jbossHome">${basedir}/target/jbossas-with-remote-outbound-connection</property>
-                <property name="javaVmArguments">${server.jvm.args} -Djboss.inst=${basedir}/target/jbossas-with-remote-outbound-connection -Djboss.node.name=jbossas-with-remote-outbound-connection</property>
+                <property name="javaVmArguments">${server.jvm2.args} -Djboss.inst=${basedir}/target/jbossas-with-remote-outbound-connection -Djboss.node.name=jbossas-with-remote-outbound-connection</property>
                 <property name="serverConfig">${jboss.server.config.file.name:standalone-ha.xml}</property>
                 <property name="jbossArguments">${jboss.args}</property>
                 <property name="allowConnectingToRunningServer">true</property>
@@ -56,7 +56,7 @@
         <container qualifier="jbossas-with-remote-outbound-connection-non-clustered" default="false" mode="manual">
             <configuration>
                 <property name="jbossHome">${basedir}/target/jbossas-with-remote-outbound-connection</property>
-                <property name="javaVmArguments">${server.jvm.args} -Djboss.inst=${basedir}/target/jbossas-with-remote-outbound-connection -Djboss.node.name=jbossas-with-remote-outbound-connection</property>
+                <property name="javaVmArguments">${server.jvm2.args} -Djboss.inst=${basedir}/target/jbossas-with-remote-outbound-connection -Djboss.node.name=jbossas-with-remote-outbound-connection</property>
                 <property name="serverConfig">standalone.xml</property>
                 <property name="jbossArguments">${jboss.args}</property>
                 <property name="allowConnectingToRunningServer">true</property>

diff --git a/testsuite/integration/multinode/pom.xml b/testsuite/integration/multinode/pom.xml
@@ -85,6 +85,7 @@
                                 <jboss.server.config.file.name>standalone.xml</jboss.server.config.file.name>
                                 <!-- EJB client library hack, see WFLY-4973-->
                                 <org.jboss.ejb.client.wildfly-testsuite-hack>true</org.jboss.ejb.client.wildfly-testsuite-hack>
+                                <server.jvm2.args>${surefire.system.args} ${jvm.args.ip} -Djboss.bind.address=${node1} -Djboss.bind.address.management=${node1} -Djboss.bind.address.unsecure=${node1} -Dnode0=${node0} -Dnode1=${node1}</server.jvm2.args>
                             </systemPropertyVariables>
                         </configuration>
                     </plugin>

diff --git a/testsuite/integration/multinode/src/test/config/arq/arquillian.xml b/testsuite/integration/multinode/src/test/config/arq/arquillian.xml
@@ -27,7 +27,7 @@
         <container qualifier="multinode-server" default="false">
             <configuration>
                 <property name="jbossHome">${basedir}/target/jbossas-multinode-server</property>
-                <property name="javaVmArguments">${server.jvm.args} -Djboss.inst=${basedir}/target/jbossas-multinode-server -Djboss.node.name=multinode-server</property>
+                <property name="javaVmArguments">${server.jvm2.args} -Djboss.inst=${basedir}/target/jbossas-multinode-server -Djboss.node.name=multinode-server</property>
                 <property name="serverConfig">${jboss.server.config.file.name:standalone.xml}</property>
                 <property name="jbossArguments">${jboss.args}</property>
                 <property name="managementAddress">${node1}</property>