Merge pull request #7577 from kabir/fix-mixed-domain-ipv6

[WFLY-4745] Fix mixed domain tests on ipv6
wildfly · Jun 4, 2015 · 95339a1 · 95339a1
2 parents f1c7dce + 5b2bf95
commit 95339a1
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/...mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/DomainAdjuster.java b/...mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/DomainAdjuster.java
@@ -35,6 +35,7 @@
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SERVER_GROUP;
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SOCKET_BINDING_GROUP;
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUBSYSTEM;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SYSTEM_PROPERTY;
 import static org.jboss.as.test.integration.domain.management.util.DomainTestUtils.executeForResult;
 
 import java.util.ArrayList;
@@ -112,6 +113,8 @@ final void adjust(final DomainClient client) throws Exception {
             removeProfile(client, profileName);
         }
 
+        removeIpv4SystemProperty(client);
+
         //Add a jaspi test security domain used later by the tests
         addJaspiTestSecurityDomain(client);
 
@@ -120,6 +123,13 @@ final void adjust(final DomainClient client) throws Exception {
         applyVersionAdjustments(client, adjustments);
     }
 
+    private void removeIpv4SystemProperty(final DomainClient client) throws Exception {
+        //The standard domain configuration contains -Djava.net.preferIPv4Stack=true, remove that
+        DomainTestUtils.executeForResult(
+                Util.createRemoveOperation(PathAddress.pathAddress(SYSTEM_PROPERTY, "java.net.preferIPv4Stack")), client);
+
+    }
+
     protected List<ModelNode> adjustForVersion(final DomainClient client, final PathAddress profileAddress) throws  Exception {
         return Collections.emptyList();
     }