root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Disable failing Jetty SSE tests for now 

https://github.com/eclipse/jetty.project/issues/730
This commit is contained in:
Rossen Stoyanchev 2016-07-15 17:26:53 -04:00
parent 111b4ae74e
commit 2029b6e0b7
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/SseIntegrationTests.java
View File

@ -16,6 +16,7 @@
package org.springframework.web.reactive.result.method.annotation; package org.springframework.web.reactive.result.method.annotation;
import static org.junit.Assume.assumeFalse;
import static org.springframework.web.client.reactive.ClientWebRequestBuilders.*; import static org.springframework.web.client.reactive.ClientWebRequestBuilders.*;
import static org.springframework.web.client.reactive.ResponseExtractors.*; import static org.springframework.web.client.reactive.ResponseExtractors.*;
@ -47,6 +48,7 @@ import org.springframework.http.converter.reactive.CodecHttpMessageConverter;
import org.springframework.http.converter.reactive.HttpMessageConverter; import org.springframework.http.converter.reactive.HttpMessageConverter;
import org.springframework.http.server.reactive.AbstractHttpHandlerIntegrationTests; import org.springframework.http.server.reactive.AbstractHttpHandlerIntegrationTests;
import org.springframework.http.server.reactive.HttpHandler; import org.springframework.http.server.reactive.HttpHandler;
import org.springframework.http.server.reactive.bootstrap.JettyHttpServer;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.client.reactive.WebClient; import org.springframework.web.client.reactive.WebClient;
@ -67,6 +69,10 @@ public class SseIntegrationTests extends AbstractHttpHandlerIntegrationTests {
@Before @Before
public void setup() throws Exception { public void setup() throws Exception {
super.setup(); super.setup();
// See https://github.com/eclipse/jetty.project/issues/730
assumeFalse(server instanceof JettyHttpServer);
this.webClient = new WebClient(new ReactorClientHttpConnector()); this.webClient = new WebClient(new ReactorClientHttpConnector());
List<HttpMessageConverter<?>> converters = new ArrayList<>(); List<HttpMessageConverter<?>> converters = new ArrayList<>();
converters.add(new CodecHttpMessageConverter<>(new ByteBufferEncoder(), new ByteBufferDecoder())); converters.add(new CodecHttpMessageConverter<>(new ByteBufferEncoder(), new ByteBufferDecoder()));