Skip to content

Commit 630bb33

Browse files
mhalbrittermhalbritter
committed
Revert "Disable tests which use Bitnami images"
This reverts commit 24a23c4. See gh-46983
1 parent 9363f03 commit 630bb33

14 files changed

+0
-36
lines changed

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

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

1919
import java.util.List;
2020

21-
import org.junit.jupiter.api.Disabled;
22-
2321
import org.springframework.boot.autoconfigure.cassandra.CassandraConnectionDetails;
2422
import org.springframework.boot.autoconfigure.cassandra.CassandraConnectionDetails.Node;
2523
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
@@ -39,7 +37,6 @@ void runCreatesConnectionDetails(CassandraConnectionDetails connectionDetails) {
3937
assertConnectionDetails(connectionDetails);
4038
}
4139

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

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

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

1919
import java.sql.Driver;
2020

21-
import org.junit.jupiter.api.Disabled;
22-
2321
import org.springframework.boot.autoconfigure.jdbc.JdbcConnectionDetails;
2422
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
2523
import org.springframework.boot.jdbc.DatabaseDriver;
@@ -44,7 +42,6 @@ void runCreatesConnectionDetails(JdbcConnectionDetails connectionDetails) throws
4442
}
4543

4644
@DockerComposeTest(composeFile = "clickhouse-bitnami-compose.yaml", image = TestImage.BITNAMI_CLICKHOUSE)
47-
@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
4845
void runWithBitnamiImageCreatesConnectionDetails(JdbcConnectionDetails connectionDetails) {
4946
assertConnectionDetails(connectionDetails);
5047
// 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: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
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;
2524
import reactor.core.publisher.Mono;
2625

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

4746
@DockerComposeTest(composeFile = "clickhouse-bitnami-compose.yaml", image = TestImage.BITNAMI_CLICKHOUSE)
48-
@Disabled("https://github.com/spring-projects/spring-boot/issues/46983")
4947
void runWithBitnamiImageCreatesConnectionDetails(R2dbcConnectionDetails connectionDetails) {
5048
assertConnectionDetails(connectionDetails);
5149
// 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: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

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

19-
import org.junit.jupiter.api.Disabled;
20-
2119
import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchConnectionDetails;
2220
import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchConnectionDetails.Node;
2321
import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchConnectionDetails.Node.Protocol;
@@ -42,7 +40,6 @@ void runCreatesConnectionDetails(ElasticsearchConnectionDetails connectionDetail
4240
}
4341

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

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

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

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

19-
import org.junit.jupiter.api.Disabled;
20-
2119
import org.springframework.boot.autoconfigure.jdbc.JdbcConnectionDetails;
2220
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
2321
import org.springframework.boot.testsupport.container.TestImage;
@@ -40,7 +38,6 @@ void runCreatesConnectionDetails(JdbcConnectionDetails connectionDetails) {
4038
}
4139

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

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

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

1919
import io.r2dbc.spi.ConnectionFactoryOptions;
20-
import org.junit.jupiter.api.Disabled;
2120

2221
import org.springframework.boot.autoconfigure.r2dbc.R2dbcConnectionDetails;
2322
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
@@ -41,7 +40,6 @@ void runCreatesConnectionDetails(R2dbcConnectionDetails connectionDetails) {
4140
}
4241

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

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

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

1919
import com.mongodb.ConnectionString;
20-
import org.junit.jupiter.api.Disabled;
2120
import org.junit.jupiter.api.condition.OS;
2221

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

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

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

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

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

19-
import org.junit.jupiter.api.Disabled;
20-
2119
import org.springframework.boot.autoconfigure.jdbc.JdbcConnectionDetails;
2220
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
2321
import org.springframework.boot.testsupport.container.TestImage;
@@ -40,7 +38,6 @@ void runCreatesConnectionDetails(JdbcConnectionDetails connectionDetails) {
4038
}
4139

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

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

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

1919
import io.r2dbc.spi.ConnectionFactoryOptions;
20-
import org.junit.jupiter.api.Disabled;
2120

2221
import org.springframework.boot.autoconfigure.r2dbc.R2dbcConnectionDetails;
2322
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
@@ -40,7 +39,6 @@ void runCreatesConnectionDetails(R2dbcConnectionDetails connectionDetails) {
4039
}
4140

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

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

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

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

19-
import org.junit.jupiter.api.Disabled;
2019
import org.neo4j.driver.AuthTokens;
2120
import org.neo4j.driver.Driver;
2221
import org.neo4j.driver.GraphDatabase;
@@ -42,7 +41,6 @@ void runCreatesConnectionDetailsThatCanAccessNeo4j(Neo4jConnectionDetails connec
4241
}
4342

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

0 commit comments

Comments
 (0)