[webkit-changes] [266586] releases/WebKitGTK/webkit-2.30

Fri, 04 Sep 2020 04:17:04 -0700

Title: [266586] releases/WebKitGTK/webkit-2.30
Revision
266586
Author
[email protected]
Date
2020-09-04 04:15:52 -0700 (Fri, 04 Sep 2020)

Log Message

Merge r265940 - REGRESSION(r265856) [GTK][WPE] hybi websockets tests failing
https://bugs.webkit.org/show_bug.cgi?id=215679

Reviewed by Carlos Garcia Campos.

Source/WebKit:

r265856 changed WebSocketChannel to expect AbnormalClosure when the
closing handshake is not received.

Covered by existing tests.

* NetworkProcess/soup/WebSocketTaskSoup.cpp:
(WebKit::WebSocketTask::didFail):

LayoutTests:

Rebaseline and update expectations.

* platform/glib/TestExpectations:
* platform/glib/http/tests/websocket/tests/hybi/close-code-and-reason-expected.txt:
* platform/glib/http/tests/websocket/tests/hybi/workers/close-code-and-reason-expected.txt:

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.30/LayoutTests/ChangeLog (266585 => 266586)


--- releases/WebKitGTK/webkit-2.30/LayoutTests/ChangeLog	2020-09-04 11:15:44 UTC (rev 266585)
+++ releases/WebKitGTK/webkit-2.30/LayoutTests/ChangeLog	2020-09-04 11:15:52 UTC (rev 266586)
@@ -1,3 +1,16 @@
+2020-08-20  Lauro Moura  <[email protected]>
+
+        REGRESSION(r265856) [GTK][WPE] hybi websockets tests failing
+        https://bugs.webkit.org/show_bug.cgi?id=215679
+
+        Reviewed by Carlos Garcia Campos.
+
+        Rebaseline and update expectations.
+
+        * platform/glib/TestExpectations:
+        * platform/glib/http/tests/websocket/tests/hybi/close-code-and-reason-expected.txt:
+        * platform/glib/http/tests/websocket/tests/hybi/workers/close-code-and-reason-expected.txt:
+
 2020-08-13  Carlos Garcia Campos  <[email protected]>
 
         Crash in WebCore::StyledMarkupAccumulator::traverseNodesForSerialization

Modified: releases/WebKitGTK/webkit-2.30/LayoutTests/platform/glib/http/tests/websocket/tests/hybi/close-code-and-reason-expected.txt (266585 => 266586)


--- releases/WebKitGTK/webkit-2.30/LayoutTests/platform/glib/http/tests/websocket/tests/hybi/close-code-and-reason-expected.txt	2020-09-04 11:15:44 UTC (rev 266585)
+++ releases/WebKitGTK/webkit-2.30/LayoutTests/platform/glib/http/tests/websocket/tests/hybi/close-code-and-reason-expected.txt	2020-09-04 11:15:52 UTC (rev 266586)
@@ -12,11 +12,11 @@
 WebSocketTest.onopen() was called with testId = 0.
 WebSocketTest.onclose() was called with testId = 0.
 PASS typeof closeEvent.wasClean is 'boolean'
-FAIL closeEvent.wasClean should be true. Was false.
+PASS closeEvent.wasClean is true
 PASS closeEvent.code is 1005
 PASS closeEvent.reason is ''
 PASS typeof closeEvent.wasClean is 'boolean'
-FAIL closeEvent.wasClean should be true. Was false.
+PASS closeEvent.wasClean is true
 PASS closeEvent.code is 1005
 PASS closeEvent.reason is ''
 WebSocketTest.onopen() was called with testId = 1.
@@ -23,11 +23,11 @@
 WebSocketTest.onclose() was called with testId = 1.
 PASS typeof closeEvent.wasClean is 'boolean'
 PASS closeEvent.wasClean is false
-FAIL closeEvent.code should be 1006. Was 0.
+PASS closeEvent.code is 1006
 PASS closeEvent.reason is ''
 PASS typeof closeEvent.wasClean is 'boolean'
 PASS closeEvent.wasClean is false
-FAIL closeEvent.code should be 1006. Was 0.
+PASS closeEvent.code is 1006
 PASS closeEvent.reason is ''
 WebSocketTest.onopen() was called with testId = 2.
 WebSocketTest.onclose() was called with testId = 2.
@@ -42,11 +42,11 @@
 WebSocketTest.onopen() was called with testId = 3.
 WebSocketTest.onclose() was called with testId = 3.
 PASS typeof closeEvent.wasClean is 'boolean'
-PASS closeEvent.wasClean is false
+FAIL closeEvent.wasClean should be false. Was true.
 FAIL closeEvent.code should be 1006. Was 1005.
 FAIL closeEvent.reason should be . Was foo.
 PASS typeof closeEvent.wasClean is 'boolean'
-PASS closeEvent.wasClean is false
+FAIL closeEvent.wasClean should be false. Was true.
 FAIL closeEvent.code should be 1006. Was 1005.
 FAIL closeEvent.reason should be . Was foo.
 WebSocketTest.onopen() was called with testId = 4.
@@ -53,30 +53,30 @@
 WebSocketTest.onclose() was called with testId = 4.
 PASS typeof closeEvent.wasClean is 'boolean'
 PASS closeEvent.wasClean is false
-FAIL closeEvent.code should be 1006. Was 0.
+PASS closeEvent.code is 1006
 PASS closeEvent.reason is ''
 PASS typeof closeEvent.wasClean is 'boolean'
 PASS closeEvent.wasClean is false
-FAIL closeEvent.code should be 1006. Was 0.
+PASS closeEvent.code is 1006
 PASS closeEvent.reason is ''
 WebSocketTest.onopen() was called with testId = 5.
 WebSocketTest.onclose() was called with testId = 5.
 PASS typeof closeEvent.wasClean is 'boolean'
 PASS closeEvent.wasClean is false
-FAIL closeEvent.code should be 1006. Was 0.
+PASS closeEvent.code is 1006
 PASS closeEvent.reason is ''
 PASS typeof closeEvent.wasClean is 'boolean'
 PASS closeEvent.wasClean is false
-FAIL closeEvent.code should be 1006. Was 0.
+PASS closeEvent.code is 1006
 PASS closeEvent.reason is ''
 WebSocketTest.onopen() was called with testId = 6.
 WebSocketTest.onclose() was called with testId = 6.
 PASS typeof closeEvent.wasClean is 'boolean'
-FAIL closeEvent.wasClean should be true. Was false.
+PASS closeEvent.wasClean is true
 PASS closeEvent.code is 65535
 PASS closeEvent.reason is 'good bye'
 PASS typeof closeEvent.wasClean is 'boolean'
-FAIL closeEvent.wasClean should be true. Was false.
+PASS closeEvent.wasClean is true
 PASS closeEvent.code is 65535
 PASS closeEvent.reason is 'good bye'
 PASS successfullyParsed is true

Modified: releases/WebKitGTK/webkit-2.30/LayoutTests/platform/glib/http/tests/websocket/tests/hybi/workers/close-code-and-reason-expected.txt (266585 => 266586)


--- releases/WebKitGTK/webkit-2.30/LayoutTests/platform/glib/http/tests/websocket/tests/hybi/workers/close-code-and-reason-expected.txt	2020-09-04 11:15:44 UTC (rev 266585)
+++ releases/WebKitGTK/webkit-2.30/LayoutTests/platform/glib/http/tests/websocket/tests/hybi/workers/close-code-and-reason-expected.txt	2020-09-04 11:15:52 UTC (rev 266586)
@@ -11,19 +11,19 @@
 FAIL FAIL: worker: event.reason is not emptyString
 WebSocketTest.onopen() was called with testId = 0.
 WebSocketTest.onclose() was called with testId = 0.
-FAIL FAIL: worker: event.wasClean is not true
+PASS PASS: worker: event.wasClean is true
 PASS PASS: worker: event.code is 1005
 PASS PASS: worker: event.reason is 
-FAIL FAIL: worker: event.wasClean is not true
+PASS PASS: worker: event.wasClean is true
 PASS PASS: worker: event.code is 1005
 PASS PASS: worker: event.reason is 
 WebSocketTest.onopen() was called with testId = 1.
 WebSocketTest.onclose() was called with testId = 1.
 PASS PASS: worker: event.wasClean is false
-FAIL FAIL: worker: event.code is not 1006
+PASS PASS: worker: event.code is 1006
 PASS PASS: worker: event.reason is 
 PASS PASS: worker: event.wasClean is false
-FAIL FAIL: worker: event.code is not 1006
+PASS PASS: worker: event.code is 1006
 PASS PASS: worker: event.reason is 
 WebSocketTest.onopen() was called with testId = 2.
 WebSocketTest.onclose() was called with testId = 2.
@@ -35,34 +35,34 @@
 PASS PASS: worker: event.reason is ok
 WebSocketTest.onopen() was called with testId = 3.
 WebSocketTest.onclose() was called with testId = 3.
-PASS PASS: worker: event.wasClean is false
+FAIL FAIL: worker: event.wasClean is not false
 FAIL FAIL: worker: event.code is not 1006
 FAIL FAIL: worker: event.reason is not 
-PASS PASS: worker: event.wasClean is false
+FAIL FAIL: worker: event.wasClean is not false
 FAIL FAIL: worker: event.code is not 1006
 FAIL FAIL: worker: event.reason is not 
 WebSocketTest.onopen() was called with testId = 4.
 WebSocketTest.onclose() was called with testId = 4.
 PASS PASS: worker: event.wasClean is false
-FAIL FAIL: worker: event.code is not 1006
+PASS PASS: worker: event.code is 1006
 PASS PASS: worker: event.reason is 
 PASS PASS: worker: event.wasClean is false
-FAIL FAIL: worker: event.code is not 1006
+PASS PASS: worker: event.code is 1006
 PASS PASS: worker: event.reason is 
 WebSocketTest.onopen() was called with testId = 5.
 WebSocketTest.onclose() was called with testId = 5.
 PASS PASS: worker: event.wasClean is false
-FAIL FAIL: worker: event.code is not 1006
+PASS PASS: worker: event.code is 1006
 PASS PASS: worker: event.reason is 
 PASS PASS: worker: event.wasClean is false
-FAIL FAIL: worker: event.code is not 1006
+PASS PASS: worker: event.code is 1006
 PASS PASS: worker: event.reason is 
 WebSocketTest.onopen() was called with testId = 6.
 WebSocketTest.onclose() was called with testId = 6.
-FAIL FAIL: worker: event.wasClean is not true
+PASS PASS: worker: event.wasClean is true
 PASS PASS: worker: event.code is 65535
 PASS PASS: worker: event.reason is good bye
-FAIL FAIL: worker: event.wasClean is not true
+PASS PASS: worker: event.wasClean is true
 PASS PASS: worker: event.code is 65535
 PASS PASS: worker: event.reason is good bye
 DONE

Modified: releases/WebKitGTK/webkit-2.30/Source/WebKit/ChangeLog (266585 => 266586)


--- releases/WebKitGTK/webkit-2.30/Source/WebKit/ChangeLog	2020-09-04 11:15:44 UTC (rev 266585)
+++ releases/WebKitGTK/webkit-2.30/Source/WebKit/ChangeLog	2020-09-04 11:15:52 UTC (rev 266586)
@@ -1,3 +1,18 @@
+2020-08-20  Lauro Moura  <[email protected]>
+
+        REGRESSION(r265856) [GTK][WPE] hybi websockets tests failing
+        https://bugs.webkit.org/show_bug.cgi?id=215679
+
+        Reviewed by Carlos Garcia Campos.
+
+        r265856 changed WebSocketChannel to expect AbnormalClosure when the
+        closing handshake is not received.
+
+        Covered by existing tests.
+
+        * NetworkProcess/soup/WebSocketTaskSoup.cpp:
+        (WebKit::WebSocketTask::didFail):
+
 2020-08-19  Youenn Fablet  <[email protected]>
 
         WebSocketChannel::didClose should correctly compute whether a closing handshake was received

Modified: releases/WebKitGTK/webkit-2.30/Source/WebKit/NetworkProcess/soup/WebSocketTaskSoup.cpp (266585 => 266586)


--- releases/WebKitGTK/webkit-2.30/Source/WebKit/NetworkProcess/soup/WebSocketTaskSoup.cpp	2020-09-04 11:15:44 UTC (rev 266585)
+++ releases/WebKitGTK/webkit-2.30/Source/WebKit/NetworkProcess/soup/WebSocketTaskSoup.cpp	2020-09-04 11:15:52 UTC (rev 266586)
@@ -179,7 +179,7 @@
     }
 
     if (soup_websocket_connection_get_state(m_connection.get()) == SOUP_WEBSOCKET_STATE_OPEN)
-        didClose(0, { });
+        didClose(WebCore::WebSocketChannel::CloseEventCodeAbnormalClosure, { });
 }
 
 void WebSocketTask::didCloseCallback(WebSocketTask* task)

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to