Skip to content

Commit 953f7d4

Browse files
committed
Filter out hanging tests realted to Reactor Netty
Issue: SPR-14975
1 parent 0e20360 commit 953f7d4

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingMessageConversionIntegrationTests.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
import org.springframework.http.ResponseEntity;
5353
import org.springframework.http.codec.json.Jackson2JsonEncoder;
5454
import org.springframework.http.server.reactive.ZeroCopyIntegrationTests;
55+
import org.springframework.http.server.reactive.bootstrap.ReactorHttpServer;
5556
import org.springframework.web.bind.annotation.GetMapping;
5657
import org.springframework.web.bind.annotation.PostMapping;
5758
import org.springframework.web.bind.annotation.RequestBody;
@@ -62,6 +63,7 @@
6263
import static java.util.Arrays.asList;
6364
import static org.junit.Assert.assertEquals;
6465
import static org.junit.Assert.assertTrue;
66+
import static org.junit.Assume.assumeFalse;
6567
import static org.springframework.http.MediaType.APPLICATION_XML;
6668

6769
/**
@@ -175,6 +177,10 @@ public void personResponseBodyWithObservable() throws Exception {
175177

176178
@Test
177179
public void resource() throws Exception {
180+
181+
// SPR-14975
182+
assumeFalse(server instanceof ReactorHttpServer);
183+
178184
ResponseEntity<byte[]> response = performGet("/resource", new HttpHeaders(), byte[].class);
179185

180186
assertEquals(HttpStatus.OK, response.getStatusCode());

spring-web/src/test/java/org/springframework/http/server/reactive/ZeroCopyIntegrationTests.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.io.File;
2020
import java.net.URI;
2121

22+
import org.junit.Assume;
2223
import org.junit.Test;
2324
import reactor.core.publisher.Mono;
2425

@@ -34,6 +35,7 @@
3435

3536
import static org.junit.Assert.assertEquals;
3637
import static org.junit.Assert.assertTrue;
38+
import static org.junit.Assume.assumeFalse;
3739
import static org.junit.Assume.assumeTrue;
3840

3941
/**
@@ -50,9 +52,12 @@ protected HttpHandler createHttpHandler() {
5052

5153
@Test
5254
public void zeroCopy() throws Exception {
55+
56+
// SPR-14975
57+
assumeFalse(server instanceof ReactorHttpServer);
58+
5359
// Zero-copy only does not support servlet
54-
assumeTrue(server instanceof ReactorHttpServer ||
55-
server instanceof UndertowHttpServer);
60+
assumeTrue(server instanceof ReactorHttpServer || server instanceof UndertowHttpServer);
5661

5762
RestTemplate restTemplate = new RestTemplate();
5863

0 commit comments

Comments
 (0)