From da0c4f552094204d392eb6669ef50387cf37967b Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Sun, 1 Oct 2017 13:07:49 -0700 Subject: [PATCH] Increase endpoint integration test timeouts Allow longer for test responses to be returned. See gh-9316 --- .../endpoint/web/AbstractWebEndpointIntegrationTests.java | 2 +- .../actuate/endpoint/web/test/AbstractWebEndpointRunner.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/AbstractWebEndpointIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/AbstractWebEndpointIntegrationTests.java index 1ac3002b55..e1c02d6d6f 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/AbstractWebEndpointIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/AbstractWebEndpointIntegrationTests.java @@ -63,7 +63,7 @@ import static org.mockito.Mockito.verify; */ public abstract class AbstractWebEndpointIntegrationTests { - private static final Duration TIMEOUT = Duration.ofMinutes(2); + private static final Duration TIMEOUT = Duration.ofMinutes(6); private final Class exporterConfiguration; diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/test/AbstractWebEndpointRunner.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/test/AbstractWebEndpointRunner.java index 030636cc56..3114efc45f 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/test/AbstractWebEndpointRunner.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/test/AbstractWebEndpointRunner.java @@ -47,6 +47,8 @@ import org.springframework.web.util.DefaultUriBuilderFactory.EncodingMode; */ abstract class AbstractWebEndpointRunner extends BlockJUnit4ClassRunner { + private static final Duration TIMEOUT = Duration.ofMinutes(6); + private final String name; private final TestContext testContext; @@ -187,7 +189,7 @@ abstract class AbstractWebEndpointRunner extends BlockJUnit4ClassRunner { "http://localhost:" + determinePort()); uriBuilderFactory.setEncodingMode(EncodingMode.NONE); return WebTestClient.bindToServer().uriBuilderFactory(uriBuilderFactory) - .responseTimeout(Duration.ofSeconds(30)).build(); + .responseTimeout(TIMEOUT).build(); } private int determinePort() {