From cec159110d08f4da8365f53e87ab700419030ac7 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 28 Apr 2023 09:52:27 +0100 Subject: [PATCH] Do not block indefinitely when querying SQL database --- ...DockerComposeConnectionDetailsFactoryIntegrationTests.java | 4 +++- ...DockerComposeConnectionDetailsFactoryIntegrationTests.java | 4 +++- .../OracleR2dbcContainerConnectionDetailsFactoryTests.java | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java index eeec9f61e1..d060092f35 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -16,6 +16,8 @@ package org.springframework.boot.docker.compose.service.connection.oracle; +import java.time.Duration; + import io.r2dbc.spi.ConnectionFactories; import io.r2dbc.spi.ConnectionFactoryOptions; import org.junit.jupiter.api.Test; @@ -49,7 +51,7 @@ class OracleR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests extends A .sql(DatabaseDriver.ORACLE.getValidationQuery()) .map((row, metadata) -> row.get(0)) .first() - .block(); + .block(Duration.ofSeconds(30)); assertThat(result).isEqualTo("Hello"); } diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/sqlserver/SqlServerR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/sqlserver/SqlServerR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java index 7ac94dc38a..b3b6d52f12 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/sqlserver/SqlServerR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/sqlserver/SqlServerR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -16,6 +16,8 @@ package org.springframework.boot.docker.compose.service.connection.sqlserver; +import java.time.Duration; + import io.r2dbc.spi.ConnectionFactories; import io.r2dbc.spi.ConnectionFactoryOptions; import org.junit.jupiter.api.Test; @@ -50,7 +52,7 @@ class SqlServerR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests .sql(DatabaseDriver.SQLSERVER.getValidationQuery()) .map((row, metadata) -> row.get(0)) .first() - .block(); + .block(Duration.ofSeconds(30)); assertThat(result).isEqualTo(1); } diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/r2dbc/OracleR2dbcContainerConnectionDetailsFactoryTests.java b/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/r2dbc/OracleR2dbcContainerConnectionDetailsFactoryTests.java index a9fce38f3e..c247a89f14 100644 --- a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/r2dbc/OracleR2dbcContainerConnectionDetailsFactoryTests.java +++ b/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/r2dbc/OracleR2dbcContainerConnectionDetailsFactoryTests.java @@ -16,6 +16,8 @@ package org.springframework.boot.testcontainers.service.connection.r2dbc; +import java.time.Duration; + import io.r2dbc.spi.ConnectionFactory; import org.junit.jupiter.api.Test; import org.testcontainers.containers.OracleContainer; @@ -56,7 +58,7 @@ class OracleR2dbcContainerConnectionDetailsFactoryTests { .sql(DatabaseDriver.ORACLE.getValidationQuery()) .map((row, metadata) -> row.get(0)) .first() - .block(); + .block(Duration.ofSeconds(30)); assertThat(result).isEqualTo("Hello"); }