svn commit: r1516295 - in /tomcat/trunk/test/org/apache/tomcat/websocket: TestWebSocketFrameClient.java TesterFirehoseServer.java

[markt]

Author: markt
Date: Wed Aug 21 20:24:24 2013
New Revision: 1516295

URL: http://svn.apache.org/r1516295
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/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
    tomcat/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java

Modified: 
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java?rev=1516295&r1=1516294&r2=1516295&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java 
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java 
Wed Aug 21 20:24:24 2013
@@ -76,7 +76,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/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java?rev=1516295&r1=1516294&r2=1516295&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java 
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java Wed 
Aug 21 20:24:24 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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org