Skip to content

Commit 24a23c4

Browse files
mhalbrittermhalbritter
committed
Disable tests which use Bitnami images
See gh-46983
1 parent e1e8914 commit 24a23c4

14 files changed

+36
-0
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818

1919
import java.util.List;
2020

21+
import org.junit.jupiter.api.Disabled;
22+
2123
import org.springframework.boot.autoconfigure.cassandra.CassandraConnectionDetails;
2224
import org.springframework.boot.autoconfigure.cassandra.CassandraConnectionDetails.Node;
2325
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
@@ -37,6 +39,7 @@ void runCreatesConnectionDetails(CassandraConnectionDetails connectionDetails) {
3739
assertConnectionDetails(connectionDetails);
3840
}
3941

42+
@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
4043
@DockerComposeTest(composeFile = "cassandra-bitnami-compose.yaml", image = TestImage.BITNAMI_CASSANDRA)
4144
void runWithBitnamiImageCreatesConnectionDetails(CassandraConnectionDetails connectionDetails) {
4245
assertConnectionDetails(connectionDetails);

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818

1919
import java.sql.Driver;
2020

21+
import org.junit.jupiter.api.Disabled;
22+
2123
import org.springframework.boot.autoconfigure.jdbc.JdbcConnectionDetails;
2224
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
2325
import org.springframework.boot.jdbc.DatabaseDriver;
@@ -42,6 +44,7 @@ void runCreatesConnectionDetails(JdbcConnectionDetails connectionDetails) throws
4244
}
4345

4446
@DockerComposeTest(composeFile = "clickhouse-bitnami-compose.yaml", image = TestImage.BITNAMI_CLICKHOUSE)
47+
@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
4548
void runWithBitnamiImageCreatesConnectionDetails(JdbcConnectionDetails connectionDetails) {
4649
assertConnectionDetails(connectionDetails);
4750
// See https://github.com/bitnami/containers/issues/73550

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import io.r2dbc.spi.ConnectionFactories;
2222
import io.r2dbc.spi.ConnectionFactory;
2323
import io.r2dbc.spi.ConnectionFactoryOptions;
24+
import org.junit.jupiter.api.Disabled;
2425
import reactor.core.publisher.Mono;
2526

2627
import org.springframework.boot.autoconfigure.r2dbc.R2dbcConnectionDetails;
@@ -44,6 +45,7 @@ void runCreatesConnectionDetails(R2dbcConnectionDetails connectionDetails) {
4445
}
4546

4647
@DockerComposeTest(composeFile = "clickhouse-bitnami-compose.yaml", image = TestImage.BITNAMI_CLICKHOUSE)
48+
@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
4749
void runWithBitnamiImageCreatesConnectionDetails(R2dbcConnectionDetails connectionDetails) {
4850
assertConnectionDetails(connectionDetails);
4951
// See https://github.com/bitnami/containers/issues/73550

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
package org.springframework.boot.docker.compose.service.connection.elasticsearch;
1818

19+
import org.junit.jupiter.api.Disabled;
20+
1921
import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchConnectionDetails;
2022
import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchConnectionDetails.Node;
2123
import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchConnectionDetails.Node.Protocol;
@@ -40,6 +42,7 @@ void runCreatesConnectionDetails(ElasticsearchConnectionDetails connectionDetail
4042
}
4143

4244
@DockerComposeTest(composeFile = "elasticsearch-bitnami-compose.yaml", image = TestImage.BITNAMI_ELASTICSEARCH)
45+
@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
4346
void runWithBitnamiImageCreatesConnectionDetails(ElasticsearchConnectionDetails connectionDetails) {
4447
assertConnectionDetails(connectionDetails);
4548
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
package org.springframework.boot.docker.compose.service.connection.mariadb;
1818

19+
import org.junit.jupiter.api.Disabled;
20+
1921
import org.springframework.boot.autoconfigure.jdbc.JdbcConnectionDetails;
2022
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
2123
import org.springframework.boot.testsupport.container.TestImage;
@@ -38,6 +40,7 @@ void runCreatesConnectionDetails(JdbcConnectionDetails connectionDetails) {
3840
}
3941

4042
@DockerComposeTest(composeFile = "mariadb-bitnami-compose.yaml", image = TestImage.BITNAMI_MARIADB)
43+
@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
4144
void runWithBitnamiImageCreatesConnectionDetails(JdbcConnectionDetails connectionDetails) {
4245
assertConnectionDetails(connectionDetails);
4346
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.springframework.boot.docker.compose.service.connection.mariadb;
1818

1919
import io.r2dbc.spi.ConnectionFactoryOptions;
20+
import org.junit.jupiter.api.Disabled;
2021

2122
import org.springframework.boot.autoconfigure.r2dbc.R2dbcConnectionDetails;
2223
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
@@ -40,6 +41,7 @@ void runCreatesConnectionDetails(R2dbcConnectionDetails connectionDetails) {
4041
}
4142

4243
@DockerComposeTest(composeFile = "mariadb-bitnami-compose.yaml", image = TestImage.BITNAMI_MARIADB)
44+
@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
4345
void runWithBitnamiImageCreatesConnectionDetails(R2dbcConnectionDetails connectionDetails) {
4446
assertConnectionDetails(connectionDetails);
4547
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.springframework.boot.docker.compose.service.connection.mongo;
1818

1919
import com.mongodb.ConnectionString;
20+
import org.junit.jupiter.api.Disabled;
2021
import org.junit.jupiter.api.condition.OS;
2122

2223
import org.springframework.boot.autoconfigure.mongo.MongoConnectionDetails;
@@ -43,6 +44,7 @@ void runCreatesConnectionDetails(MongoConnectionDetails connectionDetails) {
4344

4445
@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64", disabledReason = "The image has no ARM support")
4546
@DockerComposeTest(composeFile = "mongo-bitnami-compose.yaml", image = TestImage.BITNAMI_MONGODB)
47+
@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
4648
void runWithBitnamiImageCreatesConnectionDetails(MongoConnectionDetails connectionDetails) {
4749
assertConnectionDetailsWithDatabase(connectionDetails, "testdb");
4850
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
package org.springframework.boot.docker.compose.service.connection.mysql;
1818

19+
import org.junit.jupiter.api.Disabled;
20+
1921
import org.springframework.boot.autoconfigure.jdbc.JdbcConnectionDetails;
2022
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
2123
import org.springframework.boot.testsupport.container.TestImage;
@@ -38,6 +40,7 @@ void runCreatesConnectionDetails(JdbcConnectionDetails connectionDetails) {
3840
}
3941

4042
@DockerComposeTest(composeFile = "mysql-bitnami-compose.yaml", image = TestImage.BITNAMI_MYSQL)
43+
@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
4144
void runWithBitnamiImageCreatesConnectionDetails(JdbcConnectionDetails connectionDetails) {
4245
assertConnectionDetails(connectionDetails);
4346
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.springframework.boot.docker.compose.service.connection.mysql;
1818

1919
import io.r2dbc.spi.ConnectionFactoryOptions;
20+
import org.junit.jupiter.api.Disabled;
2021

2122
import org.springframework.boot.autoconfigure.r2dbc.R2dbcConnectionDetails;
2223
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
@@ -39,6 +40,7 @@ void runCreatesConnectionDetails(R2dbcConnectionDetails connectionDetails) {
3940
}
4041

4142
@DockerComposeTest(composeFile = "mysql-bitnami-compose.yaml", image = TestImage.BITNAMI_MYSQL)
43+
@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
4244
void runWithBitnamiImageCreatesConnectionDetails(R2dbcConnectionDetails connectionDetails) {
4345
assertConnectionDetails(connectionDetails);
4446
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package org.springframework.boot.docker.compose.service.connection.neo4j;
1818

19+
import org.junit.jupiter.api.Disabled;
1920
import org.neo4j.driver.AuthTokens;
2021
import org.neo4j.driver.Driver;
2122
import org.neo4j.driver.GraphDatabase;
@@ -41,6 +42,7 @@ void runCreatesConnectionDetailsThatCanAccessNeo4j(Neo4jConnectionDetails connec
4142
}
4243

4344
@DockerComposeTest(composeFile = "neo4j-bitnami-compose.yaml", image = TestImage.BITNAMI_NEO4J)
45+
@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
4446
void runWithBitnamiImageCreatesConnectionDetailsThatCanAccessNeo4j(Neo4jConnectionDetails connectionDetails) {
4547
assertConnectionDetailsWithPassword(connectionDetails, "bitnami2");
4648
}

0 commit comments

Comments
 (0)