Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
da0c4f55
Commit
da0c4f55
authored
Oct 01, 2017
by
Phillip Webb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Increase endpoint integration test timeouts
Allow longer for test responses to be returned. See gh-9316
parent
4df84c53
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
AbstractWebEndpointIntegrationTests.java
...ate/endpoint/web/AbstractWebEndpointIntegrationTests.java
+1
-1
AbstractWebEndpointRunner.java
.../actuate/endpoint/web/test/AbstractWebEndpointRunner.java
+3
-1
No files found.
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/AbstractWebEndpointIntegrationTests.java
View file @
da0c4f55
...
@@ -63,7 +63,7 @@ import static org.mockito.Mockito.verify;
...
@@ -63,7 +63,7 @@ import static org.mockito.Mockito.verify;
*/
*/
public
abstract
class
AbstractWebEndpointIntegrationTests
<
T
extends
ConfigurableApplicationContext
>
{
public
abstract
class
AbstractWebEndpointIntegrationTests
<
T
extends
ConfigurableApplicationContext
>
{
private
static
final
Duration
TIMEOUT
=
Duration
.
ofMinutes
(
2
);
private
static
final
Duration
TIMEOUT
=
Duration
.
ofMinutes
(
6
);
private
final
Class
<?>
exporterConfiguration
;
private
final
Class
<?>
exporterConfiguration
;
...
...
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/test/AbstractWebEndpointRunner.java
View file @
da0c4f55
...
@@ -47,6 +47,8 @@ import org.springframework.web.util.DefaultUriBuilderFactory.EncodingMode;
...
@@ -47,6 +47,8 @@ import org.springframework.web.util.DefaultUriBuilderFactory.EncodingMode;
*/
*/
abstract
class
AbstractWebEndpointRunner
extends
BlockJUnit4ClassRunner
{
abstract
class
AbstractWebEndpointRunner
extends
BlockJUnit4ClassRunner
{
private
static
final
Duration
TIMEOUT
=
Duration
.
ofMinutes
(
6
);
private
final
String
name
;
private
final
String
name
;
private
final
TestContext
testContext
;
private
final
TestContext
testContext
;
...
@@ -187,7 +189,7 @@ abstract class AbstractWebEndpointRunner extends BlockJUnit4ClassRunner {
...
@@ -187,7 +189,7 @@ abstract class AbstractWebEndpointRunner extends BlockJUnit4ClassRunner {
"http://localhost:"
+
determinePort
());
"http://localhost:"
+
determinePort
());
uriBuilderFactory
.
setEncodingMode
(
EncodingMode
.
NONE
);
uriBuilderFactory
.
setEncodingMode
(
EncodingMode
.
NONE
);
return
WebTestClient
.
bindToServer
().
uriBuilderFactory
(
uriBuilderFactory
)
return
WebTestClient
.
bindToServer
().
uriBuilderFactory
(
uriBuilderFactory
)
.
responseTimeout
(
Duration
.
ofSeconds
(
30
)
).
build
();
.
responseTimeout
(
TIMEOUT
).
build
();
}
}
private
int
determinePort
()
{
private
int
determinePort
()
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment