root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Revert "Disable tests which use Bitnami images" 

This reverts commit 24a23c4f72.

See gh-46983
This commit is contained in:
Moritz Halbritter 2025-09-19 09:00:51 +02:00
parent 9363f03d8d
commit 630bb335ea
14 changed files with 0 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/cassandra/CassandraDockerComposeConnectionDetailsFactoryIntegrationTests.java
View File

@ -18,8 +18,6 @@ package org.springframework.boot.docker.compose.service.connection.cassandra;
import java.util.List; import java.util.List;
import org.junit.jupiter.api.Disabled;
import org.springframework.boot.autoconfigure.cassandra.CassandraConnectionDetails; import org.springframework.boot.autoconfigure.cassandra.CassandraConnectionDetails;
import org.springframework.boot.autoconfigure.cassandra.CassandraConnectionDetails.Node; import org.springframework.boot.autoconfigure.cassandra.CassandraConnectionDetails.Node;
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest; import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
@ -39,7 +37,6 @@ class CassandraDockerComposeConnectionDetailsFactoryIntegrationTests {
assertConnectionDetails(connectionDetails); assertConnectionDetails(connectionDetails);
} }
@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
@DockerComposeTest(composeFile = "cassandra-bitnami-compose.yaml", image = TestImage.BITNAMI_CASSANDRA) @DockerComposeTest(composeFile = "cassandra-bitnami-compose.yaml", image = TestImage.BITNAMI_CASSANDRA)
void runWithBitnamiImageCreatesConnectionDetails(CassandraConnectionDetails connectionDetails) { void runWithBitnamiImageCreatesConnectionDetails(CassandraConnectionDetails connectionDetails) {
assertConnectionDetails(connectionDetails); assertConnectionDetails(connectionDetails);

3
spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/clickhouse/ClickHouseJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java
View File

@ -18,8 +18,6 @@ package org.springframework.boot.docker.compose.service.connection.clickhouse;
import java.sql.Driver; import java.sql.Driver;
import org.junit.jupiter.api.Disabled;
import org.springframework.boot.autoconfigure.jdbc.JdbcConnectionDetails; import org.springframework.boot.autoconfigure.jdbc.JdbcConnectionDetails;
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest; import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
import org.springframework.boot.jdbc.DatabaseDriver; import org.springframework.boot.jdbc.DatabaseDriver;
@ -44,7 +42,6 @@ class ClickHouseJdbcDockerComposeConnectionDetailsFactoryIntegrationTests {
} }
@DockerComposeTest(composeFile = "clickhouse-bitnami-compose.yaml", image = TestImage.BITNAMI_CLICKHOUSE) @DockerComposeTest(composeFile = "clickhouse-bitnami-compose.yaml", image = TestImage.BITNAMI_CLICKHOUSE)
@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
void runWithBitnamiImageCreatesConnectionDetails(JdbcConnectionDetails connectionDetails) { void runWithBitnamiImageCreatesConnectionDetails(JdbcConnectionDetails connectionDetails) {
assertConnectionDetails(connectionDetails); assertConnectionDetails(connectionDetails);
// See https://github.com/bitnami/containers/issues/73550 // See https://github.com/bitnami/containers/issues/73550

2
spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/clickhouse/ClickHouseR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java
View File

@ -21,7 +21,6 @@ import java.time.Duration;
import io.r2dbc.spi.ConnectionFactories; import io.r2dbc.spi.ConnectionFactories;
import io.r2dbc.spi.ConnectionFactory; import io.r2dbc.spi.ConnectionFactory;
import io.r2dbc.spi.ConnectionFactoryOptions; import io.r2dbc.spi.ConnectionFactoryOptions;
import org.junit.jupiter.api.Disabled;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import org.springframework.boot.autoconfigure.r2dbc.R2dbcConnectionDetails; import org.springframework.boot.autoconfigure.r2dbc.R2dbcConnectionDetails;
@ -45,7 +44,6 @@ class ClickHouseR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests {
} }
@DockerComposeTest(composeFile = "clickhouse-bitnami-compose.yaml", image = TestImage.BITNAMI_CLICKHOUSE) @DockerComposeTest(composeFile = "clickhouse-bitnami-compose.yaml", image = TestImage.BITNAMI_CLICKHOUSE)
@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
void runWithBitnamiImageCreatesConnectionDetails(R2dbcConnectionDetails connectionDetails) { void runWithBitnamiImageCreatesConnectionDetails(R2dbcConnectionDetails connectionDetails) {
assertConnectionDetails(connectionDetails); assertConnectionDetails(connectionDetails);
// See https://github.com/bitnami/containers/issues/73550 // See https://github.com/bitnami/containers/issues/73550

3
spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/elasticsearch/ElasticsearchDockerComposeConnectionDetailsFactoryIntegrationTests.java
View File

@ -16,8 +16,6 @@
package org.springframework.boot.docker.compose.service.connection.elasticsearch; 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;
import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchConnectionDetails.Node; import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchConnectionDetails.Node;
import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchConnectionDetails.Node.Protocol; 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) @DockerComposeTest(composeFile = "elasticsearch-bitnami-compose.yaml", image = TestImage.BITNAMI_ELASTICSEARCH)
@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
void runWithBitnamiImageCreatesConnectionDetails(ElasticsearchConnectionDetails connectionDetails) { void runWithBitnamiImageCreatesConnectionDetails(ElasticsearchConnectionDetails connectionDetails) {
assertConnectionDetails(connectionDetails); assertConnectionDetails(connectionDetails);
} }

3
spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mariadb/MariaDbJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java
View File

@ -16,8 +16,6 @@
package org.springframework.boot.docker.compose.service.connection.mariadb; 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.autoconfigure.jdbc.JdbcConnectionDetails;
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest; import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
import org.springframework.boot.testsupport.container.TestImage; import org.springframework.boot.testsupport.container.TestImage;
@ -40,7 +38,6 @@ class MariaDbJdbcDockerComposeConnectionDetailsFactoryIntegrationTests {
} }
@DockerComposeTest(composeFile = "mariadb-bitnami-compose.yaml", image = TestImage.BITNAMI_MARIADB) @DockerComposeTest(composeFile = "mariadb-bitnami-compose.yaml", image = TestImage.BITNAMI_MARIADB)
@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
void runWithBitnamiImageCreatesConnectionDetails(JdbcConnectionDetails connectionDetails) { void runWithBitnamiImageCreatesConnectionDetails(JdbcConnectionDetails connectionDetails) {
assertConnectionDetails(connectionDetails); assertConnectionDetails(connectionDetails);
} }

2
spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mariadb/MariaDbR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java
View File

@ -17,7 +17,6 @@
package org.springframework.boot.docker.compose.service.connection.mariadb; package org.springframework.boot.docker.compose.service.connection.mariadb;
import io.r2dbc.spi.ConnectionFactoryOptions; import io.r2dbc.spi.ConnectionFactoryOptions;
import org.junit.jupiter.api.Disabled;
import org.springframework.boot.autoconfigure.r2dbc.R2dbcConnectionDetails; import org.springframework.boot.autoconfigure.r2dbc.R2dbcConnectionDetails;
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest; 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) @DockerComposeTest(composeFile = "mariadb-bitnami-compose.yaml", image = TestImage.BITNAMI_MARIADB)
@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
void runWithBitnamiImageCreatesConnectionDetails(R2dbcConnectionDetails connectionDetails) { void runWithBitnamiImageCreatesConnectionDetails(R2dbcConnectionDetails connectionDetails) {
assertConnectionDetails(connectionDetails); assertConnectionDetails(connectionDetails);
} }

2
spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mongo/MongoDockerComposeConnectionDetailsFactoryIntegrationTests.java
View File

@ -17,7 +17,6 @@
package org.springframework.boot.docker.compose.service.connection.mongo; package org.springframework.boot.docker.compose.service.connection.mongo;
import com.mongodb.ConnectionString; import com.mongodb.ConnectionString;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.condition.OS; import org.junit.jupiter.api.condition.OS;
import org.springframework.boot.autoconfigure.mongo.MongoConnectionDetails; 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") @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) @DockerComposeTest(composeFile = "mongo-bitnami-compose.yaml", image = TestImage.BITNAMI_MONGODB)
@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
void runWithBitnamiImageCreatesConnectionDetails(MongoConnectionDetails connectionDetails) { void runWithBitnamiImageCreatesConnectionDetails(MongoConnectionDetails connectionDetails) {
assertConnectionDetailsWithDatabase(connectionDetails, "testdb"); assertConnectionDetailsWithDatabase(connectionDetails, "testdb");
} }

3
spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mysql/MySqlJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java
View File

@ -16,8 +16,6 @@
package org.springframework.boot.docker.compose.service.connection.mysql; 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.autoconfigure.jdbc.JdbcConnectionDetails;
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest; import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
import org.springframework.boot.testsupport.container.TestImage; import org.springframework.boot.testsupport.container.TestImage;
@ -40,7 +38,6 @@ class MySqlJdbcDockerComposeConnectionDetailsFactoryIntegrationTests {
} }
@DockerComposeTest(composeFile = "mysql-bitnami-compose.yaml", image = TestImage.BITNAMI_MYSQL) @DockerComposeTest(composeFile = "mysql-bitnami-compose.yaml", image = TestImage.BITNAMI_MYSQL)
@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
void runWithBitnamiImageCreatesConnectionDetails(JdbcConnectionDetails connectionDetails) { void runWithBitnamiImageCreatesConnectionDetails(JdbcConnectionDetails connectionDetails) {
assertConnectionDetails(connectionDetails); assertConnectionDetails(connectionDetails);
} }

2
spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mysql/MySqlR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java
View File

@ -17,7 +17,6 @@
package org.springframework.boot.docker.compose.service.connection.mysql; package org.springframework.boot.docker.compose.service.connection.mysql;
import io.r2dbc.spi.ConnectionFactoryOptions; import io.r2dbc.spi.ConnectionFactoryOptions;
import org.junit.jupiter.api.Disabled;
import org.springframework.boot.autoconfigure.r2dbc.R2dbcConnectionDetails; import org.springframework.boot.autoconfigure.r2dbc.R2dbcConnectionDetails;
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest; 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) @DockerComposeTest(composeFile = "mysql-bitnami-compose.yaml", image = TestImage.BITNAMI_MYSQL)
@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
void runWithBitnamiImageCreatesConnectionDetails(R2dbcConnectionDetails connectionDetails) { void runWithBitnamiImageCreatesConnectionDetails(R2dbcConnectionDetails connectionDetails) {
assertConnectionDetails(connectionDetails); assertConnectionDetails(connectionDetails);
} }

2
spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/neo4j/Neo4jDockerComposeConnectionDetailsFactoryIntegrationTests.java
View File

@ -16,7 +16,6 @@
package org.springframework.boot.docker.compose.service.connection.neo4j; package org.springframework.boot.docker.compose.service.connection.neo4j;
import org.junit.jupiter.api.Disabled;
import org.neo4j.driver.AuthTokens; import org.neo4j.driver.AuthTokens;
import org.neo4j.driver.Driver; import org.neo4j.driver.Driver;
import org.neo4j.driver.GraphDatabase; import org.neo4j.driver.GraphDatabase;
@ -42,7 +41,6 @@ class Neo4jDockerComposeConnectionDetailsFactoryIntegrationTests {
} }
@DockerComposeTest(composeFile = "neo4j-bitnami-compose.yaml", image = TestImage.BITNAMI_NEO4J) @DockerComposeTest(composeFile = "neo4j-bitnami-compose.yaml", image = TestImage.BITNAMI_NEO4J)
@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
void runWithBitnamiImageCreatesConnectionDetailsThatCanAccessNeo4j(Neo4jConnectionDetails connectionDetails) { void runWithBitnamiImageCreatesConnectionDetailsThatCanAccessNeo4j(Neo4jConnectionDetails connectionDetails) {
assertConnectionDetailsWithPassword(connectionDetails, "bitnami2"); assertConnectionDetailsWithPassword(connectionDetails, "bitnami2");
} }

3
spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java
View File

@ -18,8 +18,6 @@ package org.springframework.boot.docker.compose.service.connection.postgres;
import java.sql.Driver; import java.sql.Driver;
import org.junit.jupiter.api.Disabled;
import org.springframework.boot.autoconfigure.jdbc.JdbcConnectionDetails; import org.springframework.boot.autoconfigure.jdbc.JdbcConnectionDetails;
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest; import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
import org.springframework.boot.jdbc.DatabaseDriver; import org.springframework.boot.jdbc.DatabaseDriver;
@ -56,7 +54,6 @@ class PostgresJdbcDockerComposeConnectionDetailsFactoryIntegrationTests {
} }
@DockerComposeTest(composeFile = "postgres-bitnami-compose.yaml", image = TestImage.BITNAMI_POSTGRESQL) @DockerComposeTest(composeFile = "postgres-bitnami-compose.yaml", image = TestImage.BITNAMI_POSTGRESQL)
@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
void runWithBitnamiImageCreatesConnectionDetails(JdbcConnectionDetails connectionDetails) void runWithBitnamiImageCreatesConnectionDetails(JdbcConnectionDetails connectionDetails)
throws ClassNotFoundException { throws ClassNotFoundException {
assertConnectionDetails(connectionDetails); assertConnectionDetails(connectionDetails);

2
spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java
View File

@ -20,7 +20,6 @@ import java.time.Duration;
import io.r2dbc.spi.ConnectionFactories; import io.r2dbc.spi.ConnectionFactories;
import io.r2dbc.spi.ConnectionFactoryOptions; import io.r2dbc.spi.ConnectionFactoryOptions;
import org.junit.jupiter.api.Disabled;
import org.springframework.boot.autoconfigure.r2dbc.R2dbcConnectionDetails; import org.springframework.boot.autoconfigure.r2dbc.R2dbcConnectionDetails;
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest; 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) @DockerComposeTest(composeFile = "postgres-bitnami-compose.yaml", image = TestImage.BITNAMI_POSTGRESQL)
@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
void runWithBitnamiImageCreatesConnectionDetails(R2dbcConnectionDetails connectionDetails) { void runWithBitnamiImageCreatesConnectionDetails(R2dbcConnectionDetails connectionDetails) {
assertConnectionDetails(connectionDetails); assertConnectionDetails(connectionDetails);
checkDatabaseAccess(connectionDetails); checkDatabaseAccess(connectionDetails);

3
spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/rabbit/RabbitDockerComposeConnectionDetailsFactoryIntegrationTests.java
View File

@ -16,8 +16,6 @@
package org.springframework.boot.docker.compose.service.connection.rabbit; 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;
import org.springframework.boot.autoconfigure.amqp.RabbitConnectionDetails.Address; import org.springframework.boot.autoconfigure.amqp.RabbitConnectionDetails.Address;
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest; 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) @DockerComposeTest(composeFile = "rabbit-bitnami-compose.yaml", image = TestImage.BITNAMI_RABBITMQ)
@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
void runWithBitnamiImageCreatesConnectionDetails(RabbitConnectionDetails connectionDetails) { void runWithBitnamiImageCreatesConnectionDetails(RabbitConnectionDetails connectionDetails) {
assertConnectionDetails(connectionDetails); assertConnectionDetails(connectionDetails);
} }

3
spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/redis/RedisDockerComposeConnectionDetailsFactoryIntegrationTests.java
View File

@ -16,8 +16,6 @@
package org.springframework.boot.docker.compose.service.connection.redis; 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;
import org.springframework.boot.autoconfigure.data.redis.RedisConnectionDetails.Standalone; import org.springframework.boot.autoconfigure.data.redis.RedisConnectionDetails.Standalone;
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest; 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) @DockerComposeTest(composeFile = "redis-bitnami-compose.yaml", image = TestImage.BITNAMI_REDIS)
@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
void runWithBitnamiImageCreatesConnectionDetails(RedisConnectionDetails connectionDetails) { void runWithBitnamiImageCreatesConnectionDetails(RedisConnectionDetails connectionDetails) {
assertConnectionDetails(connectionDetails); assertConnectionDetails(connectionDetails);
} }