Sync with latest reactor netty changes

2016-12-13 17:22:11 +00:00
parent 39d2769bd0
commit 6922a1c534
7 changed files with 29 additions and 32 deletions
--- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingMessageConversionIntegrationTests.java
+++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingMessageConversionIntegrationTests.java
@@ -177,10 +177,6 @@ public class RequestMappingMessageConversionIntegrationTests extends AbstractReq

 	@Test
 	public void resource() throws Exception {
-
-		// SPR-14975
-		assumeFalse(server instanceof ReactorHttpServer);
-
 		ResponseEntity<byte[]> response = performGet("/resource", new HttpHeaders(), byte[].class);

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