Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Enforce timeout in WebFlux multipart tests

Browse Source
This commit is contained in:
Rossen Stoyanchev
2021-09-17 14:38:13 +01:00
parent 8b5f5d9f65
commit 01426481ea
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-webflux/src/test/java/org/springframework/web/reactive/function/MultipartIntegrationTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@ import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.time.Duration;
import java.util.Map;
import reactor.core.publisher.Mono;
@@ -72,7 +73,8 @@ class MultipartIntegrationTests extends AbstractRouterFunctionIntegrationTests {
StepVerifier
.create(result)
.consumeNextWith(entity -> assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK))
.verifyComplete();
.expectComplete()
.verify(Duration.ofSeconds(5));
}
@ParameterizedHttpServerTest
@@ -89,7 +91,8 @@ class MultipartIntegrationTests extends AbstractRouterFunctionIntegrationTests {
StepVerifier
.create(result)
.consumeNextWith(entity -> assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK))
.verifyComplete();
.expectComplete()
.verify(Duration.ofSeconds(5));
}
@ParameterizedHttpServerTest
@@ -119,7 +122,8 @@ class MultipartIntegrationTests extends AbstractRouterFunctionIntegrationTests {
fail("IOException", ex);
}
})
.verifyComplete();
.expectComplete()
.verify(Duration.ofSeconds(5));
}
private MultiValueMap<String, HttpEntity<?>> generateBody() {
@@ -193,8 +197,7 @@ class MultipartIntegrationTests extends AbstractRouterFunctionIntegrationTests {
catch (IOException ex) {
return Mono.error(ex);
}
})
.subscribeOn(Schedulers.boundedElastic());
}).subscribeOn(Schedulers.boundedElastic());
}
}