From 630bb335ea710e45de8e48fd9fe1352a98d8e293 Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Fri, 19 Sep 2025 09:00:51 +0200 Subject: [PATCH] Revert "Disable tests which use Bitnami images" This reverts commit 24a23c4f72ed7d1b863cee3f3b9d9336c00c4957. See gh-46983 --- ...aDockerComposeConnectionDetailsFactoryIntegrationTests.java | 3 --- ...cDockerComposeConnectionDetailsFactoryIntegrationTests.java | 3 --- ...cDockerComposeConnectionDetailsFactoryIntegrationTests.java | 2 -- ...hDockerComposeConnectionDetailsFactoryIntegrationTests.java | 3 --- ...cDockerComposeConnectionDetailsFactoryIntegrationTests.java | 3 --- ...cDockerComposeConnectionDetailsFactoryIntegrationTests.java | 2 -- ...oDockerComposeConnectionDetailsFactoryIntegrationTests.java | 2 -- ...cDockerComposeConnectionDetailsFactoryIntegrationTests.java | 3 --- ...cDockerComposeConnectionDetailsFactoryIntegrationTests.java | 2 -- ...jDockerComposeConnectionDetailsFactoryIntegrationTests.java | 2 -- ...cDockerComposeConnectionDetailsFactoryIntegrationTests.java | 3 --- ...cDockerComposeConnectionDetailsFactoryIntegrationTests.java | 2 -- ...tDockerComposeConnectionDetailsFactoryIntegrationTests.java | 3 --- ...sDockerComposeConnectionDetailsFactoryIntegrationTests.java | 3 --- 14 files changed, 36 deletions(-) diff --git a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/cassandra/CassandraDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/cassandra/CassandraDockerComposeConnectionDetailsFactoryIntegrationTests.java index 839451e32cb..dc20d1012a9 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/cassandra/CassandraDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/cassandra/CassandraDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -18,8 +18,6 @@ package org.springframework.boot.docker.compose.service.connection.cassandra; import java.util.List; -import org.junit.jupiter.api.Disabled; - import org.springframework.boot.autoconfigure.cassandra.CassandraConnectionDetails; import org.springframework.boot.autoconfigure.cassandra.CassandraConnectionDetails.Node; import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest; @@ -39,7 +37,6 @@ class CassandraDockerComposeConnectionDetailsFactoryIntegrationTests { assertConnectionDetails(connectionDetails); } - @Disabled("https://github.com/spring-projects/spring-boot/issues/46983") @DockerComposeTest(composeFile = "cassandra-bitnami-compose.yaml", image = TestImage.BITNAMI_CASSANDRA) void runWithBitnamiImageCreatesConnectionDetails(CassandraConnectionDetails connectionDetails) { assertConnectionDetails(connectionDetails); diff --git a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/clickhouse/ClickHouseJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/clickhouse/ClickHouseJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java index 7423aea1c7d..e4342ec488d 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/clickhouse/ClickHouseJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/clickhouse/ClickHouseJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -18,8 +18,6 @@ package org.springframework.boot.docker.compose.service.connection.clickhouse; import java.sql.Driver; -import org.junit.jupiter.api.Disabled; - import org.springframework.boot.autoconfigure.jdbc.JdbcConnectionDetails; import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest; import org.springframework.boot.jdbc.DatabaseDriver; @@ -44,7 +42,6 @@ class ClickHouseJdbcDockerComposeConnectionDetailsFactoryIntegrationTests { } @DockerComposeTest(composeFile = "clickhouse-bitnami-compose.yaml", image = TestImage.BITNAMI_CLICKHOUSE) - @Disabled("https://github.com/spring-projects/spring-boot/issues/46983") void runWithBitnamiImageCreatesConnectionDetails(JdbcConnectionDetails connectionDetails) { assertConnectionDetails(connectionDetails); // See https://github.com/bitnami/containers/issues/73550 diff --git a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/clickhouse/ClickHouseR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/clickhouse/ClickHouseR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java index c4644095c04..710548c34b9 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/clickhouse/ClickHouseR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/clickhouse/ClickHouseR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -21,7 +21,6 @@ import java.time.Duration; import io.r2dbc.spi.ConnectionFactories; import io.r2dbc.spi.ConnectionFactory; import io.r2dbc.spi.ConnectionFactoryOptions; -import org.junit.jupiter.api.Disabled; import reactor.core.publisher.Mono; import org.springframework.boot.autoconfigure.r2dbc.R2dbcConnectionDetails; @@ -45,7 +44,6 @@ class ClickHouseR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests { } @DockerComposeTest(composeFile = "clickhouse-bitnami-compose.yaml", image = TestImage.BITNAMI_CLICKHOUSE) - @Disabled("https://github.com/spring-projects/spring-boot/issues/46983") void runWithBitnamiImageCreatesConnectionDetails(R2dbcConnectionDetails connectionDetails) { assertConnectionDetails(connectionDetails); // See https://github.com/bitnami/containers/issues/73550 diff --git a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/elasticsearch/ElasticsearchDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/elasticsearch/ElasticsearchDockerComposeConnectionDetailsFactoryIntegrationTests.java index 4f382cc7a50..8892ac8c8f7 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/elasticsearch/ElasticsearchDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/elasticsearch/ElasticsearchDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -16,8 +16,6 @@ package org.springframework.boot.docker.compose.service.connection.elasticsearch; -import org.junit.jupiter.api.Disabled; - import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchConnectionDetails; import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchConnectionDetails.Node; import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchConnectionDetails.Node.Protocol; @@ -42,7 +40,6 @@ class ElasticsearchDockerComposeConnectionDetailsFactoryIntegrationTests { } @DockerComposeTest(composeFile = "elasticsearch-bitnami-compose.yaml", image = TestImage.BITNAMI_ELASTICSEARCH) - @Disabled("https://github.com/spring-projects/spring-boot/issues/46983") void runWithBitnamiImageCreatesConnectionDetails(ElasticsearchConnectionDetails connectionDetails) { assertConnectionDetails(connectionDetails); } diff --git a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mariadb/MariaDbJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mariadb/MariaDbJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java index 36002d8566d..5e4c9818d49 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mariadb/MariaDbJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mariadb/MariaDbJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -16,8 +16,6 @@ package org.springframework.boot.docker.compose.service.connection.mariadb; -import org.junit.jupiter.api.Disabled; - import org.springframework.boot.autoconfigure.jdbc.JdbcConnectionDetails; import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest; import org.springframework.boot.testsupport.container.TestImage; @@ -40,7 +38,6 @@ class MariaDbJdbcDockerComposeConnectionDetailsFactoryIntegrationTests { } @DockerComposeTest(composeFile = "mariadb-bitnami-compose.yaml", image = TestImage.BITNAMI_MARIADB) - @Disabled("https://github.com/spring-projects/spring-boot/issues/46983") void runWithBitnamiImageCreatesConnectionDetails(JdbcConnectionDetails connectionDetails) { assertConnectionDetails(connectionDetails); } diff --git a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mariadb/MariaDbR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mariadb/MariaDbR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java index 87ffe3bec3e..00c468eb371 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mariadb/MariaDbR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mariadb/MariaDbR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -17,7 +17,6 @@ package org.springframework.boot.docker.compose.service.connection.mariadb; import io.r2dbc.spi.ConnectionFactoryOptions; -import org.junit.jupiter.api.Disabled; import org.springframework.boot.autoconfigure.r2dbc.R2dbcConnectionDetails; import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest; @@ -41,7 +40,6 @@ class MariaDbR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests { } @DockerComposeTest(composeFile = "mariadb-bitnami-compose.yaml", image = TestImage.BITNAMI_MARIADB) - @Disabled("https://github.com/spring-projects/spring-boot/issues/46983") void runWithBitnamiImageCreatesConnectionDetails(R2dbcConnectionDetails connectionDetails) { assertConnectionDetails(connectionDetails); } diff --git a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mongo/MongoDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mongo/MongoDockerComposeConnectionDetailsFactoryIntegrationTests.java index 42f8564a739..1bf53e3915f 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mongo/MongoDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mongo/MongoDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -17,7 +17,6 @@ package org.springframework.boot.docker.compose.service.connection.mongo; import com.mongodb.ConnectionString; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.condition.OS; import org.springframework.boot.autoconfigure.mongo.MongoConnectionDetails; @@ -44,7 +43,6 @@ class MongoDockerComposeConnectionDetailsFactoryIntegrationTests { @DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64", disabledReason = "The image has no ARM support") @DockerComposeTest(composeFile = "mongo-bitnami-compose.yaml", image = TestImage.BITNAMI_MONGODB) - @Disabled("https://github.com/spring-projects/spring-boot/issues/46983") void runWithBitnamiImageCreatesConnectionDetails(MongoConnectionDetails connectionDetails) { assertConnectionDetailsWithDatabase(connectionDetails, "testdb"); } diff --git a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mysql/MySqlJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mysql/MySqlJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java index bbf4f3a6ace..93cbf9f1ac6 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mysql/MySqlJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mysql/MySqlJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -16,8 +16,6 @@ package org.springframework.boot.docker.compose.service.connection.mysql; -import org.junit.jupiter.api.Disabled; - import org.springframework.boot.autoconfigure.jdbc.JdbcConnectionDetails; import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest; import org.springframework.boot.testsupport.container.TestImage; @@ -40,7 +38,6 @@ class MySqlJdbcDockerComposeConnectionDetailsFactoryIntegrationTests { } @DockerComposeTest(composeFile = "mysql-bitnami-compose.yaml", image = TestImage.BITNAMI_MYSQL) - @Disabled("https://github.com/spring-projects/spring-boot/issues/46983") void runWithBitnamiImageCreatesConnectionDetails(JdbcConnectionDetails connectionDetails) { assertConnectionDetails(connectionDetails); } diff --git a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mysql/MySqlR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mysql/MySqlR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java index a221d54c6c3..0a448044da0 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mysql/MySqlR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mysql/MySqlR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -17,7 +17,6 @@ package org.springframework.boot.docker.compose.service.connection.mysql; import io.r2dbc.spi.ConnectionFactoryOptions; -import org.junit.jupiter.api.Disabled; import org.springframework.boot.autoconfigure.r2dbc.R2dbcConnectionDetails; import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest; @@ -40,7 +39,6 @@ class MySqlR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests { } @DockerComposeTest(composeFile = "mysql-bitnami-compose.yaml", image = TestImage.BITNAMI_MYSQL) - @Disabled("https://github.com/spring-projects/spring-boot/issues/46983") void runWithBitnamiImageCreatesConnectionDetails(R2dbcConnectionDetails connectionDetails) { assertConnectionDetails(connectionDetails); } diff --git a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/neo4j/Neo4jDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/neo4j/Neo4jDockerComposeConnectionDetailsFactoryIntegrationTests.java index 07da60e591c..1ac9acc37cb 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/neo4j/Neo4jDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/neo4j/Neo4jDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -16,7 +16,6 @@ package org.springframework.boot.docker.compose.service.connection.neo4j; -import org.junit.jupiter.api.Disabled; import org.neo4j.driver.AuthTokens; import org.neo4j.driver.Driver; import org.neo4j.driver.GraphDatabase; @@ -42,7 +41,6 @@ class Neo4jDockerComposeConnectionDetailsFactoryIntegrationTests { } @DockerComposeTest(composeFile = "neo4j-bitnami-compose.yaml", image = TestImage.BITNAMI_NEO4J) - @Disabled("https://github.com/spring-projects/spring-boot/issues/46983") void runWithBitnamiImageCreatesConnectionDetailsThatCanAccessNeo4j(Neo4jConnectionDetails connectionDetails) { assertConnectionDetailsWithPassword(connectionDetails, "bitnami2"); } diff --git a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java index 9f3912ab2ee..45810993d52 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -18,8 +18,6 @@ package org.springframework.boot.docker.compose.service.connection.postgres; import java.sql.Driver; -import org.junit.jupiter.api.Disabled; - import org.springframework.boot.autoconfigure.jdbc.JdbcConnectionDetails; import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest; import org.springframework.boot.jdbc.DatabaseDriver; @@ -56,7 +54,6 @@ class PostgresJdbcDockerComposeConnectionDetailsFactoryIntegrationTests { } @DockerComposeTest(composeFile = "postgres-bitnami-compose.yaml", image = TestImage.BITNAMI_POSTGRESQL) - @Disabled("https://github.com/spring-projects/spring-boot/issues/46983") void runWithBitnamiImageCreatesConnectionDetails(JdbcConnectionDetails connectionDetails) throws ClassNotFoundException { assertConnectionDetails(connectionDetails); diff --git a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java index c71513300b5..913b8640e2c 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -20,7 +20,6 @@ import java.time.Duration; import io.r2dbc.spi.ConnectionFactories; import io.r2dbc.spi.ConnectionFactoryOptions; -import org.junit.jupiter.api.Disabled; import org.springframework.boot.autoconfigure.r2dbc.R2dbcConnectionDetails; import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest; @@ -58,7 +57,6 @@ class PostgresR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests { } @DockerComposeTest(composeFile = "postgres-bitnami-compose.yaml", image = TestImage.BITNAMI_POSTGRESQL) - @Disabled("https://github.com/spring-projects/spring-boot/issues/46983") void runWithBitnamiImageCreatesConnectionDetails(R2dbcConnectionDetails connectionDetails) { assertConnectionDetails(connectionDetails); checkDatabaseAccess(connectionDetails); diff --git a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/rabbit/RabbitDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/rabbit/RabbitDockerComposeConnectionDetailsFactoryIntegrationTests.java index 1f9a2b7e553..45026f8c950 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/rabbit/RabbitDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/rabbit/RabbitDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -16,8 +16,6 @@ package org.springframework.boot.docker.compose.service.connection.rabbit; -import org.junit.jupiter.api.Disabled; - import org.springframework.boot.autoconfigure.amqp.RabbitConnectionDetails; import org.springframework.boot.autoconfigure.amqp.RabbitConnectionDetails.Address; import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest; @@ -41,7 +39,6 @@ class RabbitDockerComposeConnectionDetailsFactoryIntegrationTests { } @DockerComposeTest(composeFile = "rabbit-bitnami-compose.yaml", image = TestImage.BITNAMI_RABBITMQ) - @Disabled("https://github.com/spring-projects/spring-boot/issues/46983") void runWithBitnamiImageCreatesConnectionDetails(RabbitConnectionDetails connectionDetails) { assertConnectionDetails(connectionDetails); } diff --git a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/redis/RedisDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/redis/RedisDockerComposeConnectionDetailsFactoryIntegrationTests.java index dfb78f3a68c..bececd2b6c9 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/redis/RedisDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/redis/RedisDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -16,8 +16,6 @@ package org.springframework.boot.docker.compose.service.connection.redis; -import org.junit.jupiter.api.Disabled; - import org.springframework.boot.autoconfigure.data.redis.RedisConnectionDetails; import org.springframework.boot.autoconfigure.data.redis.RedisConnectionDetails.Standalone; import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest; @@ -42,7 +40,6 @@ class RedisDockerComposeConnectionDetailsFactoryIntegrationTests { } @DockerComposeTest(composeFile = "redis-bitnami-compose.yaml", image = TestImage.BITNAMI_REDIS) - @Disabled("https://github.com/spring-projects/spring-boot/issues/46983") void runWithBitnamiImageCreatesConnectionDetails(RedisConnectionDetails connectionDetails) { assertConnectionDetails(connectionDetails); }