Author: markt
Date: Wed Aug 21 20:24:58 2013
New Revision: 1516296
URL: http://svn.apache.org/r1516296
Log:
Use a common wait time on the server and the client.
This fixes an exception observed on some platforms with 7.0.x that distracted
from the root cause of the test failure.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1516295
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java?rev=1516296&r1=1516295&r2=1516296&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
Wed Aug 21 20:24:58 2013
@@ -82,7 +82,8 @@ public class TestWebSocketFrameClient ex
// Ignore the latch result as the message count test below will tell us
// if the right number of messages arrived
- handler.getLatch().await(60, TimeUnit.SECONDS);
+ handler.getLatch().await(TesterFirehoseServer.WAIT_TIME_MILLIS,
+ TimeUnit.MILLISECONDS);
List<String> messages = handler.getMessages();
Assert.assertEquals(
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java?rev=1516296&r1=1516295&r2=1516296&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java
Wed Aug 21 20:24:58 2013
@@ -38,6 +38,7 @@ public class TesterFirehoseServer {
public static final int MESSAGE_COUNT = 100000;
public static final String MESSAGE;
public static final int MESSAGE_SIZE = 1024;
+ public static final int WAIT_TIME_MILLIS = 60000;
static {
StringBuilder sb = new StringBuilder(MESSAGE_SIZE);
@@ -87,6 +88,10 @@ public class TesterFirehoseServer {
}
}
+ session.getUserProperties().put(
+ "org.apache.tomcat.websocket.BLOCKING_SEND_TIMEOUT",
+ Long.valueOf(WAIT_TIME_MILLIS));
+
Basic remote = session.getBasicRemote();
remote.setBatchingAllowed(true);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
