Changeset 278345 in webkit

Timestamp:

Jun 2, 2021, 2:07:34 AM (5 years ago)

Author:

youenn@apple.com

Message:

Fix race condition in binary_wsh.py
​https://bugs.webkit.org/show_bug.cgi?id=226464
<rdar://77356905>

Reviewed by Alex Christensen.

The web socket server was implemented to send 4 messages as soon as connection is opened and close the connection.
The client expects to correctly send a message before the connection is closed.
This is not guaranteed by the web socket server, in case the server is very fast closing the connection and the client very slow at sending its message.
Given the focus of the test is to validate binary data, change the web socket server to remove the potential race.

• http/tests/websocket/tests/hybi/inspector/binary_wsh.py:

(web_socket_transfer_data):

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• http/tests/websocket/tests/hybi/inspector/binary_wsh.py (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-06-02  Youenn Fablet  <youenn@apple.com>
+
+        Fix race condition in binary_wsh.py
+        https://bugs.webkit.org/show_bug.cgi?id=226464
+        <rdar://77356905>
+
+        Reviewed by Alex Christensen.
+
+        The web socket server was implemented to send 4 messages as soon as connection is opened and close the connection.
+        The client expects to correctly send a message before the connection is closed.
+        This is not guaranteed by the web socket server, in case the server is very fast closing the connection and the client very slow at sending its message.
+        Given the focus of the test is to validate binary data, change the web socket server to remove the potential race.
+
+        * http/tests/websocket/tests/hybi/inspector/binary_wsh.py:
+        (web_socket_transfer_data):
+
 2021-05-28  Antoine Quint  <graouts@webkit.org>
 

trunk/LayoutTests/http/tests/websocket/tests/hybi/inspector/binary_wsh.py

@@ -2 +2 @@
 from mod_pywebsocket import stream
 
+from mod_pywebsocket import msgutil
 
 def web_socket_do_extra_handshake(request):
@@ -8 +9 @@
 
 def web_socket_transfer_data(request):
+    # Make sure to receive a message from client before sending messages.
+    client_message = msgutil.receive_message(request)
     messages_to_send = ['Hello, world!', 'Привет, Мир!', '', all_distinct_bytes()]
     for message in messages_to_send: