diff --git a/src/test/java/com/exasol/containers/ExasolContainerAssumptions.java b/src/test/java/com/exasol/containers/ExasolContainerAssumptions.java index 7c5d76b1..171da1ad 100644 --- a/src/test/java/com/exasol/containers/ExasolContainerAssumptions.java +++ b/src/test/java/com/exasol/containers/ExasolContainerAssumptions.java @@ -42,4 +42,14 @@ public static void assumeDockerDbVersionNotOverriddenToBelowExasolSevenOne() { && dockerImageReference.hasMinor() && (dockerImageReference.getMinor() > 0))); } } -} \ No newline at end of file + + /** + * Assume that the Exasol dockerdb version a container runs with is not overridden to a version below 8 + */ + public static void assumeDockerDbVersionNotOverriddenToBelowExasolEight() { + if (getDockerImageOverrideProperty() != null) { + final ExasolDockerImageReference dockerImageReference = getDockerImageReference(); + assumeTrue((dockerImageReference.hasMajor() && (dockerImageReference.getMajor() < 8))); + } + } +} diff --git a/src/test/java/com/exasol/support/SupportInformationRetrieverIT.java b/src/test/java/com/exasol/support/SupportInformationRetrieverIT.java index 4c2617cd..1702c099 100644 --- a/src/test/java/com/exasol/support/SupportInformationRetrieverIT.java +++ b/src/test/java/com/exasol/support/SupportInformationRetrieverIT.java @@ -17,16 +17,14 @@ import org.apache.commons.compress.archivers.ArchiveEntry; import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.*; import org.junit.jupiter.api.io.TempDir; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testcontainers.containers.ContainerLaunchException; import org.testcontainers.junit.jupiter.Testcontainers; -import com.exasol.containers.ExasolContainer; -import com.exasol.containers.ExitType; +import com.exasol.containers.*; @Tag("slow") @Testcontainers @@ -34,6 +32,13 @@ class SupportInformationRetrieverIT { private static final Logger LOGGER = LoggerFactory.getLogger(SupportInformationRetrieverIT.class); private static final String SYSINFO_FILENAME = "sysinfo.txt"; + @BeforeAll + static void assumeSupportPackageSupported() { + // These tests don't work with Exasol v8. We will fix this in + // https://github.com/exasol/exasol-testcontainers/issues/254 + ExasolContainerAssumptions.assumeDockerDbVersionNotOverriddenToBelowExasolEight(); + } + // [itest->dsn~configure-support-information-retriever-via-api~1] @Test void testWriteSupportBundleOnExit(@TempDir final Path tempDir) {