Author: markt
Date: Mon Aug 10 12:46:34 2015
New Revision: 1695051
URL: http://svn.apache.org/r1695051
Log:
Increased ping delay means longer timeouts are required.
Modified:
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_8.java
Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_8.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_8.java?rev=1695051&r1=1695050&r2=1695051&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_8.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_8.java Mon Aug
10 12:46:34 2015
@@ -16,6 +16,7 @@
*/
package org.apache.coyote.http2;
+import org.apache.catalina.connector.Connector;
import org.junit.Assert;
import org.junit.Test;
@@ -34,8 +35,22 @@ public class TestHttp2Section_6_8 extend
public void testGoawayIgnoreNewStreams() throws Exception {
setPingAckDelayMillis(PNG_ACK_DELAY_MS);
- // HTTP2 upgrade
- http2Connect();
+ // HTTP2 upgrade - need longer timeouts for this test
+ Connector connector = getTomcatInstance().getConnector();
+ Http2Protocol http2Protocol = new Http2Protocol();
+ // Short timeouts for now. May need to increase these for CI systems.
+ http2Protocol.setReadTimeout(5000);
+ http2Protocol.setKeepAliveTimeout(10000);
+ http2Protocol.setWriteTimeout(5000);
+ http2Protocol.setMaxConcurrentStreams(200);
+ connector.addUpgradeProtocol(http2Protocol);
+ configureAndStartWebApplication();
+ openClientConnection();
+ doHttpUpgrade();
+ sendClientPreface();
+ validateHttp2InitialResponse();
+
+ Thread.sleep(PNG_ACK_DELAY_MS + 200);
getTomcatInstance().getConnector().pause();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
