Author: markt Date: Mon Feb 10 17:57:55 2014 New Revision: 1566689 URL: http://svn.apache.org/r1566689 Log: Fix failing test by increasing the time to wait for the socket to close.
Modified: tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java 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=1566689&r1=1566688&r2=1566689&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 Mon Feb 10 17:57:55 2014 @@ -139,7 +139,7 @@ public class TestWebSocketFrameClient ex int count = 0; int limit = TesterFirehoseServer.WAIT_TIME_MILLIS / 100; - System.out.println("Waiting for server to report an error"); + System.err.println("Waiting for server to report an error"); while (TesterFirehoseServer.Endpoint.getErrorCount() == 0 && count < limit) { Thread.sleep(100); count ++; @@ -149,11 +149,11 @@ public class TestWebSocketFrameClient ex Assert.fail("No error reported by Endpoint when timeout was expected"); } - // Wait up to another 10 seconds for the connection to be closed - + // Wait up to another 20 seconds for the connection to be closed - // should be a lot faster. - System.out.println("Waiting for connection to be closed"); + System.err.println("Waiting for connection to be closed"); count = 0; - limit = (TesterFirehoseServer.SEND_TIME_OUT_MILLIS * 2) / 100; + limit = (TesterFirehoseServer.SEND_TIME_OUT_MILLIS * 4) / 100; while (TesterFirehoseServer.Endpoint.getOpenConnectionCount() != 0 && count < limit) { Thread.sleep(100); count ++; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org