Merge pull request #13681 from jamezp/mixed-domain-fix

[WFLY-14022] Enable a way to ignore the MixedDomainDeployment700TestCase due to ARTEMIS-2800.
wildfly · Oct 29, 2020 · 3a643d6 · 3a643d6
2 parents b747caf + c4a3ce5
commit 3a643d6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/...xed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/OldVersionCopier.java b/...xed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/OldVersionCopier.java
@@ -110,7 +110,9 @@ private Path getExpandedPath() {
     private Path expandAsInstance(Version.AsVersion version) {
         createIfNotExists(targetOldVersions);
 
-        Path file = oldVersionsBaseDir.resolve(version.getZipFileName());
+
+        final String path = resolveZipFileName(version);
+        Path file = oldVersionsBaseDir.resolve(path);
         if (Files.notExists(file)) {
             throw new RuntimeException("Old version not found in " + file.toAbsolutePath().toString());
         }
@@ -218,4 +220,12 @@ private static Path verifyZipContents(Path root) throws IOException {
         return result;
     }
 
+    private static String resolveZipFileName(final Version.AsVersion requested) {
+        final String value = System.getProperty("override.mixed.domain." + requested.getVersion());
+        if (value != null) {
+            return value;
+        }
+        return requested.getZipFileName();
+    }
+
 }
diff --git a/...a/org/jboss/as/test/integration/domain/mixed/eap700/MixedDomainDeployment700TestCase.java b/...a/org/jboss/as/test/integration/domain/mixed/eap700/MixedDomainDeployment700TestCase.java
@@ -39,6 +39,9 @@ public class MixedDomainDeployment700TestCase extends MixedDomainDeploymentTest
     public static void beforeClass() {
         // WFLY-12649 -- embedded broker doesn't start correctly on an EAP 7.0.0 server running on OpenJ9
         Assume.assumeFalse(TestSuiteEnvironment.isJ9Jvm());
+        // WFLY-14022 -- 7.0.0.GA under certain JDK and Linux kernel versions expose ARTEMIS-2800
+        final String value = System.getProperty("ignore.ARTEMIS-2800");
+        Assume.assumeFalse(value != null && (value.isEmpty() || Boolean.parseBoolean(value)));
 
         MixedDomain700TestSuite.initializeDomain();
     }