Author: markt
Date: Fri Apr 15 12:22:54 2016
New Revision: 1739294
URL: http://svn.apache.org/viewvc?rev=1739294&view=rev
Log:
Fix one cause of failing tests observed locally and on CI systems.
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java?rev=1739294&r1=1739293&r2=1739294&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Fri Apr 15 12:22:54 2016
@@ -564,10 +564,15 @@ public class TestWsWebSocketContainer ex
session.getAsyncRemote().setSendTimeout(TIMEOUT_MS);
}
- long lastSend = 0;
+ // The close message is written with a blocking write. This is
going
+ // to fail so reduce the timeout from the default so the test
+ // completes faster
+ session.getUserProperties().put(
+ WsRemoteEndpointImplBase.BLOCKING_SEND_TIMEOUT_PROPERTY,
Long.valueOf(5000));
// Should send quickly until the network buffers fill up and then
// block until the timeout kicks in
+ long lastSend = 0;
try {
while (true) {
lastSend = System.currentTimeMillis();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
