INT-3909: Upgrade to Tomcat-8.0.33
JIRA: https://jira.spring.io/browse/INT-3909 Un`@Ignore` the `ClientWebSocketContainerTests` to ensure that `Tomcat-8.0.33` has the fix for the closed WebSocket session race condition. Fix `StompIntegrationTests` test data Clean up queue channels before each test, because of some remained extra messages during the web-socket protocol interactions, like socket close events or similar Fix `RedisStoreInboundChannelAdapterIntegrationTests` race conditions Since Jedis driver is async, we not always receive a reply from the `TX-sync` component immediately. And loop checking the Redis for the `key` after some `Thread.sleep()`
This commit is contained in:
committed by
Gary Russell
parent
993549111c
commit
f48d019970
@@ -35,7 +35,6 @@ import java.util.concurrent.TimeUnit;
|
||||
import org.apache.tomcat.websocket.WsWebSocketContainer;
|
||||
import org.junit.AfterClass;
|
||||
import org.junit.BeforeClass;
|
||||
import org.junit.Ignore;
|
||||
import org.junit.Test;
|
||||
|
||||
import org.springframework.web.socket.CloseStatus;
|
||||
@@ -64,7 +63,6 @@ public class ClientWebSocketContainerTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
@Ignore("Ignored until fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=58624")
|
||||
public void testClientWebSocketContainer() throws Exception {
|
||||
StandardWebSocketClient webSocketClient = new StandardWebSocketClient();
|
||||
Map<String, Object> userProperties = new HashMap<String, Object>();
|
||||
|
||||
@@ -31,6 +31,7 @@ import java.util.Collections;
|
||||
import java.util.concurrent.CountDownLatch;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
|
||||
@@ -125,7 +126,14 @@ public class StompIntegrationTests {
|
||||
|
||||
@Autowired
|
||||
@Qualifier("webSocketEvents")
|
||||
private PollableChannel webSocketEvents;
|
||||
private QueueChannel webSocketEvents;
|
||||
|
||||
@Before
|
||||
public void setup() {
|
||||
this.webSocketInputChannel.clear();
|
||||
this.webSocketEvents.clear();
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void sendMessageToController() throws Exception {
|
||||
|
||||
Reference in New Issue
Block a user