This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new f06a8ff Travis finds another place to send a reset :)
f06a8ff is described below
commit f06a8ff1b5ca7303538b580d26b64b985ab37aef
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Aug 21 20:54:16 2020 +0100
Travis finds another place to send a reset :)
---
test/org/apache/coyote/http2/TestCancelledUpload.java | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/test/org/apache/coyote/http2/TestCancelledUpload.java
b/test/org/apache/coyote/http2/TestCancelledUpload.java
index 8db3f3a..4a3126c 100644
--- a/test/org/apache/coyote/http2/TestCancelledUpload.java
+++ b/test/org/apache/coyote/http2/TestCancelledUpload.java
@@ -95,18 +95,26 @@ public class TestCancelledUpload extends Http2TestBase {
return;
}
- // Not window update, not reset, must be the response
- parser.readFrame(true);
+ // Not window update, not reset, must be the headers
Assert.assertEquals("3-HeadersStart\n" +
"3-Header-[:status]-[403]\n" +
"3-Header-[content-length]-[0]\n" +
"3-Header-[date]-[Wed, 11 Nov 2015 19:18:42 GMT]\n" +
- "3-HeadersEnd\n" +
- "3-Body-0\n" +
- "3-EndOfStream\n",
+ "3-HeadersEnd\n",
output.getTrace());
output.clearTrace();
+ parser.readFrame(true);
+ // Check for reset and exit if found
+ if (output.getTrace().startsWith("3-RST-[3]\n")) {
+ return;
+ }
+
+ // Not reset, must be request body
+ Assert.assertEquals("3-Body-0\n" +
+ "3-EndOfStream\n",
+ output.getTrace());
+
// There must be a reset. There may be some WindowSize frames
parser.readFrame(true);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
