From 15d4baf14da3cc31edeccc4dc02b0de3357264c8 Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Tue, 9 Apr 2019 14:52:03 -0400
Subject: [PATCH] Updates test to work around possible RSocket bug

---
 .../rsocket/server/GatewayRSocketIntegrationTests.java      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/spring-cloud-gateway-rsocket/src/test/java/org/springframework/cloud/gateway/rsocket/server/GatewayRSocketIntegrationTests.java b/spring-cloud-gateway-rsocket/src/test/java/org/springframework/cloud/gateway/rsocket/server/GatewayRSocketIntegrationTests.java
index d522a419..5c3bac5b 100644
--- a/spring-cloud-gateway-rsocket/src/test/java/org/springframework/cloud/gateway/rsocket/server/GatewayRSocketIntegrationTests.java
+++ b/spring-cloud-gateway-rsocket/src/test/java/org/springframework/cloud/gateway/rsocket/server/GatewayRSocketIntegrationTests.java
@@ -16,6 +16,8 @@
 
 package org.springframework.cloud.gateway.rsocket.server;
 
+import java.time.Duration;
+
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -73,7 +75,9 @@ public class GatewayRSocketIntegrationTests {
 				.expectSubscription()
 				.then(() -> server.stop())
 				.thenConsumeWhile(s -> true)
-				.verifyComplete();
+				//.expectComplete()
+				.thenCancel()  // https://github.com/rsocket/rsocket-java/issues/613
+				.verify(Duration.ofSeconds(20));
 		// @formatter:on
 
 		assertThat(ping.getPongsReceived()).isGreaterThan(0);