Skip to content

Commit cec1591

Browse files
committed
Do not block indefinitely when querying SQL database
1 parent d7da77b commit cec1591

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java

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

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

19+
import java.time.Duration;
20+
1921
import io.r2dbc.spi.ConnectionFactories;
2022
import io.r2dbc.spi.ConnectionFactoryOptions;
2123
import org.junit.jupiter.api.Test;
@@ -49,7 +51,7 @@ void runCreatesConnectionDetailsThatCanBeUsedToAccessDatabase() {
4951
.sql(DatabaseDriver.ORACLE.getValidationQuery())
5052
.map((row, metadata) -> row.get(0))
5153
.first()
52-
.block();
54+
.block(Duration.ofSeconds(30));
5355
assertThat(result).isEqualTo("Hello");
5456
}
5557

spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/sqlserver/SqlServerR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java

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

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

19+
import java.time.Duration;
20+
1921
import io.r2dbc.spi.ConnectionFactories;
2022
import io.r2dbc.spi.ConnectionFactoryOptions;
2123
import org.junit.jupiter.api.Test;
@@ -50,7 +52,7 @@ void runCreatesConnectionDetailsThatCanBeUsedToAccessDatabase() {
5052
.sql(DatabaseDriver.SQLSERVER.getValidationQuery())
5153
.map((row, metadata) -> row.get(0))
5254
.first()
53-
.block();
55+
.block(Duration.ofSeconds(30));
5456
assertThat(result).isEqualTo(1);
5557
}
5658

spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/r2dbc/OracleR2dbcContainerConnectionDetailsFactoryTests.java

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

1717
package org.springframework.boot.testcontainers.service.connection.r2dbc;
1818

19+
import java.time.Duration;
20+
1921
import io.r2dbc.spi.ConnectionFactory;
2022
import org.junit.jupiter.api.Test;
2123
import org.testcontainers.containers.OracleContainer;
@@ -56,7 +58,7 @@ void connectionCanBeMadeToOracleContainer() {
5658
.sql(DatabaseDriver.ORACLE.getValidationQuery())
5759
.map((row, metadata) -> row.get(0))
5860
.first()
59-
.block();
61+
.block(Duration.ofSeconds(30));
6062
assertThat(result).isEqualTo("Hello");
6163
}
6264

0 commit comments

Comments
 (0)