You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2024/02/13 17:47:09 UTC

(tomcat) branch main updated: Fix test failures on Windows

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
     new 985157dcd1 Fix test failures on Windows
985157dcd1 is described below

commit 985157dcd1d46d6d5d80ba9a58f3112e5ecf75a1
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Feb 13 17:46:57 2024 +0000

    Fix test failures on Windows
---
 test/org/apache/coyote/http2/TestHttp2Limits.java | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestHttp2Limits.java b/test/org/apache/coyote/http2/TestHttp2Limits.java
index 7b891fbfff..b184270dc3 100644
--- a/test/org/apache/coyote/http2/TestHttp2Limits.java
+++ b/test/org/apache/coyote/http2/TestHttp2Limits.java
@@ -281,9 +281,17 @@ public class TestHttp2Limits extends Http2TestBase {
             }
             case STREAM_RESET_THEN_CONNECTION_RESET: {
                 // Expect a stream reset
-                parser.readFrame();
-                Assert.assertEquals("3-RST-[11]\n", output.getTrace());
-                output.clearTrace();
+                // On some platform / Connector combinations the TCP connection close
+                // will be processed before the client gets a chance to read the
+                // connection close frame which will trigger an
+                // IOException when we try to read the frame.
+                try {
+                    parser.readFrame();
+                    Assert.assertEquals("3-RST-[11]\n", output.getTrace());
+                    output.clearTrace();
+                } catch (IOException ioe) {
+                    // Expected on some platforms
+                }
             }
                 //$FALL-THROUGH$
             case CONNECTION_RESET: {


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org