Skip to content

Commit f548da8

Browse files
bclozelbclozel
committed
Temporarily ignore webflux tomcat integration tests
After our Tomcat 11 upgrade, several WebFlux integration tests with Tomcat started failing because Tomcat considers some chunked client requests as invalid. While we're investigating this, this commit temporarily disables the relevant tests. See gh-33917
1 parent 4b3e192 commit f548da8

File tree

2 files changed

+28
-0
lines changed

2 files changed

+28
-0
lines changed

‎spring-webflux/src/test/java/org/springframework/web/reactive/function/MultipartRouterFunctionIntegrationTests.java

+11
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import org.springframework.web.reactive.function.server.ServerRequest;
5050
import org.springframework.web.reactive.function.server.ServerResponse;
5151
import org.springframework.web.testfixture.http.server.reactive.bootstrap.HttpServer;
52+
import org.springframework.web.testfixture.http.server.reactive.bootstrap.TomcatHttpServer;
5253
import org.springframework.web.testfixture.http.server.reactive.bootstrap.UndertowHttpServer;
5354

5455
import static org.assertj.core.api.Assertions.assertThat;
@@ -68,6 +69,8 @@ class MultipartRouterFunctionIntegrationTests extends AbstractRouterFunctionInte
6869

6970
@ParameterizedHttpServerTest
7071
void multipartData(HttpServer httpServer) throws Exception {
72+
assumeFalse(httpServer instanceof TomcatHttpServer,
73+
"TomcatHttpServer fails with invalid request body chunk");
7174
startServer(httpServer);
7275

7376
Mono<ResponseEntity<Void>> result = webClient
@@ -86,6 +89,8 @@ void multipartData(HttpServer httpServer) throws Exception {
8689

8790
@ParameterizedHttpServerTest
8891
void parts(HttpServer httpServer) throws Exception {
92+
assumeFalse(httpServer instanceof TomcatHttpServer,
93+
"TomcatHttpServer fails with invalid request body chunk");
8994
startServer(httpServer);
9095

9196
Mono<ResponseEntity<Void>> result = webClient
@@ -104,6 +109,8 @@ void parts(HttpServer httpServer) throws Exception {
104109

105110
@ParameterizedHttpServerTest
106111
void transferTo(HttpServer httpServer) throws Exception {
112+
assumeFalse(httpServer instanceof TomcatHttpServer,
113+
"TomcatHttpServer fails with invalid request body chunk");
107114
// TODO Determine why Undertow fails: https://github.com/spring-projects/spring-framework/issues/25310
108115
assumeFalse(httpServer instanceof UndertowHttpServer, "Undertow currently fails with transferTo");
109116
verifyTransferTo(httpServer);
@@ -144,6 +151,8 @@ private void verifyTransferTo(HttpServer httpServer) throws Exception {
144151

145152
@ParameterizedHttpServerTest
146153
void partData(HttpServer httpServer) throws Exception {
154+
assumeFalse(httpServer instanceof TomcatHttpServer,
155+
"TomcatHttpServer fails with invalid request body chunk");
147156
startServer(httpServer);
148157

149158
Mono<ResponseEntity<Void>> result = webClient
@@ -162,6 +171,8 @@ void partData(HttpServer httpServer) throws Exception {
162171

163172
@ParameterizedHttpServerTest
164173
void proxy(HttpServer httpServer) throws Exception {
174+
assumeFalse(httpServer instanceof TomcatHttpServer,
175+
"TomcatHttpServer fails with invalid request body chunk");
165176
assumeFalse(httpServer instanceof UndertowHttpServer, "Undertow currently fails proxying requests");
166177
startServer(httpServer);
167178

‎spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MultipartWebClientIntegrationTests.java

+17
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
import org.springframework.web.server.adapter.WebHttpHandlerBuilder;
6161
import org.springframework.web.testfixture.http.server.reactive.bootstrap.AbstractHttpHandlerIntegrationTests;
6262
import org.springframework.web.testfixture.http.server.reactive.bootstrap.HttpServer;
63+
import org.springframework.web.testfixture.http.server.reactive.bootstrap.TomcatHttpServer;
6364
import org.springframework.web.testfixture.http.server.reactive.bootstrap.UndertowHttpServer;
6465

6566
import static org.assertj.core.api.Assertions.assertThat;
@@ -87,6 +88,8 @@ protected void startServer(HttpServer httpServer) throws Exception {
8788

8889
@ParameterizedHttpServerTest
8990
void requestPart(HttpServer httpServer) throws Exception {
91+
assumeFalse(httpServer instanceof TomcatHttpServer,
92+
"TomcatHttpServer fails with invalid request body chunk");
9093
startServer(httpServer);
9194

9295
Mono<ResponseEntity<Void>> result = webClient
@@ -104,6 +107,8 @@ void requestPart(HttpServer httpServer) throws Exception {
104107

105108
@ParameterizedHttpServerTest
106109
void requestBodyMap(HttpServer httpServer) throws Exception {
110+
assumeFalse(httpServer instanceof TomcatHttpServer,
111+
"TomcatHttpServer fails with invalid request body chunk");
107112
startServer(httpServer);
108113

109114
Mono<String> result = webClient
@@ -120,6 +125,8 @@ void requestBodyMap(HttpServer httpServer) throws Exception {
120125

121126
@ParameterizedHttpServerTest
122127
void requestBodyFlux(HttpServer httpServer) throws Exception {
128+
assumeFalse(httpServer instanceof TomcatHttpServer,
129+
"TomcatHttpServer fails with invalid request body chunk");
123130
startServer(httpServer);
124131

125132
Mono<String> result = webClient
@@ -136,6 +143,8 @@ void requestBodyFlux(HttpServer httpServer) throws Exception {
136143

137144
@ParameterizedHttpServerTest
138145
void filePartsFlux(HttpServer httpServer) throws Exception {
146+
assumeFalse(httpServer instanceof TomcatHttpServer,
147+
"TomcatHttpServer fails with invalid request body chunk");
139148
startServer(httpServer);
140149

141150
Mono<String> result = webClient
@@ -152,6 +161,8 @@ void filePartsFlux(HttpServer httpServer) throws Exception {
152161

153162
@ParameterizedHttpServerTest
154163
void filePartsMono(HttpServer httpServer) throws Exception {
164+
assumeFalse(httpServer instanceof TomcatHttpServer,
165+
"TomcatHttpServer fails with invalid request body chunk");
155166
startServer(httpServer);
156167

157168
Mono<String> result = webClient
@@ -168,6 +179,8 @@ void filePartsMono(HttpServer httpServer) throws Exception {
168179

169180
@ParameterizedHttpServerTest
170181
void transferTo(HttpServer httpServer) throws Exception {
182+
assumeFalse(httpServer instanceof TomcatHttpServer,
183+
"TomcatHttpServer fails with invalid request body chunk");
171184
// TODO Determine why Undertow fails: https://github.com/spring-projects/spring-framework/issues/25310
172185
assumeFalse(httpServer instanceof UndertowHttpServer, "Undertow currently fails with transferTo");
173186
startServer(httpServer);
@@ -188,6 +201,8 @@ void transferTo(HttpServer httpServer) throws Exception {
188201

189202
@ParameterizedHttpServerTest
190203
void modelAttribute(HttpServer httpServer) throws Exception {
204+
assumeFalse(httpServer instanceof TomcatHttpServer,
205+
"TomcatHttpServer fails with invalid request body chunk");
191206
startServer(httpServer);
192207

193208
Mono<String> result = webClient
@@ -204,6 +219,8 @@ void modelAttribute(HttpServer httpServer) throws Exception {
204219

205220
@ParameterizedHttpServerTest
206221
void partData(HttpServer httpServer) throws Exception {
222+
assumeFalse(httpServer instanceof TomcatHttpServer,
223+
"TomcatHttpServer fails with invalid request body chunk");
207224
startServer(httpServer);
208225

209226
Mono<String> result = webClient

0 commit comments

Comments
 (0)