commit 44e7282b541f7a96c817688eabc4838975d3a8ca
author Mark Thomas <markt@apache.org> Wed Apr 12 14:26:16 2023 +0100
committer Mark Thomas <markt@apache.org> Wed Apr 12 14:26:16 2023 +0100
tree 730f86c9ea8b5bf9e7587416c1f664aca8954a83
parent 9f53a40a308fb8c07cb875a605ab92ab5701a4a2

Improve unreliable test (failures on Windows and Intel Mac)

test/org/apache/tomcat/websocket/server/TestKeyHeader.java

diff --git a/test/org/apache/tomcat/websocket/server/TestKeyHeader.java b/test/org/apache/tomcat/websocket/server/TestKeyHeader.java
index 8db0bd2..19f2263 100644
--- a/test/org/apache/tomcat/websocket/server/TestKeyHeader.java
+++ b/test/org/apache/tomcat/websocket/server/TestKeyHeader.java
@@ -81,6 +81,11 @@
 
         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();
     }

test/org/apache/tomcat/websocket/server/TesterWsClient.java

diff --git a/test/org/apache/tomcat/websocket/server/TesterWsClient.java b/test/org/apache/tomcat/websocket/server/TesterWsClient.java
index 097a62c..1fc6a6f 100644
--- a/test/org/apache/tomcat/websocket/server/TesterWsClient.java
+++ b/test/org/apache/tomcat/websocket/server/TesterWsClient.java
@@ -99,6 +99,10 @@
         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();