On 22/01/2014 05:31, Konstantin Kolinko wrote: > 2014/1/22 <ma...@apache.org>: >> Author: markt >> Date: Tue Jan 21 22:45:35 2014 >> New Revision: 1560214 >> >> URL: http://svn.apache.org/r1560214 >> Log: >> Back port unit test fixes / improvements >> >> Modified: >> tomcat/tc7.0.x/trunk/ (props changed) >> >> tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java >> >> Propchange: tomcat/tc7.0.x/trunk/ >> ------------------------------------------------------------------------------ >> Merged /tomcat/trunk:r1560212-1560213 >> >> 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=1560214&r1=1560213&r2=1560214&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 >> Tue Jan 21 22:45:35 2014 >> @@ -98,6 +98,12 @@ public class TestWebSocketFrameClient ex >> >> @Test >> public void testBug56032() throws Exception { >> + // TODO Investigate options to get this test to pass with the HTTP >> BIO >> + // connector. >> + if (getTomcatInstance().getConnector().getProtocol().equals( >> + "org.apache.coyote.http11.Http11Protocol")) { >> + return; >> + } > > Connector.getProtocol() returns "HTTP/1.1" for BIO connector in Tomcat 7. > Thus the above condition fails and the test is not skipped. > > This code works in trunk, as the "HTTP/1.1" value is returned for NIO > connector there.
Thanks. Fixed. Mark --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
