Author: markt
Date: Mon Jul 17 23:22:02 2017
New Revision: 1802229
URL: http://svn.apache.org/viewvc?rev=1802229&view=rev
Log:
Another NIO2 robustness change
Modified:
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Limits.java
Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Limits.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Limits.java?rev=1802229&r1=1802228&r2=1802229&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Limits.java (original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Limits.java Mon Jul 17
23:22:02 2017
@@ -487,8 +487,15 @@ public class TestHttp2Limits extends Htt
break;
}
case CONNECTION_RESET: {
- // Connection reset. Connection ID will vary so use a pattern
- parser.readFrame(true);
+ // Connection reset
+ do {
+ // NIO2 can sometimes send window updates depending on the
+ // timing of the connection close
+ output.clearTrace();
+ parser.readFrame(true);
+ } while (output.getTrace().contains("WindowSize"));
+
+ // Connection ID will vary so use a pattern
Assert.assertThat(output.getTrace(), RegexMatcher.matchesRegex(
"0-Goaway-\\[3\\]-\\[11\\]-\\[Connection \\[\\d++\\],
Stream \\[3\\], .*"));
break;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
