[tomcat] branch 10.1.x updated: Improve unreliable test (failures on Windows and Intel Mac)

[markt]

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

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


The following commit(s) were added to refs/heads/10.1.x by this push:
     new a29573a2b4 Improve unreliable test (failures on Windows and Intel Mac)
a29573a2b4 is described below

commit a29573a2b4614e373623b5d85cc56f29b04e3a50
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Apr 12 14:26:16 2023 +0100

    Improve unreliable test (failures on Windows and Intel Mac)
---
 test/org/apache/tomcat/websocket/server/TestKeyHeader.java  | 5 +++++
 test/org/apache/tomcat/websocket/server/TesterWsClient.java | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/test/org/apache/tomcat/websocket/server/TestKeyHeader.java 
b/test/org/apache/tomcat/websocket/server/TestKeyHeader.java
index 8db0bd2cc8..19f226351e 100644
--- a/test/org/apache/tomcat/websocket/server/TestKeyHeader.java
+++ b/test/org/apache/tomcat/websocket/server/TestKeyHeader.java
@@ -81,6 +81,11 @@ public class TestKeyHeader extends WebSocketBaseTest {
 
         if (expectedStatusCode == HttpServletResponse.SC_SWITCHING_PROTOCOLS) {
             client.sendCloseFrame(CloseCodes.NORMAL_CLOSURE);
+            // Read (and ignore) the response
+            byte[] buf = new byte[256];
+            while (client.read(buf) > 0) {
+               // Ignore
+            }
         }
         client.closeSocket();
     }
diff --git a/test/org/apache/tomcat/websocket/server/TesterWsClient.java 
b/test/org/apache/tomcat/websocket/server/TesterWsClient.java
index 097a62c0bd..1fc6a6ff73 100644
--- a/test/org/apache/tomcat/websocket/server/TesterWsClient.java
+++ b/test/org/apache/tomcat/websocket/server/TesterWsClient.java
@@ -99,6 +99,10 @@ public class TesterWsClient {
         socket.close();
     }
 
+    public int read(byte[] bytes) throws IOException {
+        return socket.getInputStream().read(bytes);
+    }
+
     public void write(byte[] bytes) throws IOException {
         socket.getOutputStream().write(bytes);
         socket.getOutputStream().flush();


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