Title: [271950] trunk
Revision
271950
Author
[email protected]
Date
2021-01-27 06:21:09 -0800 (Wed, 27 Jan 2021)

Log Message

Unreviewed, reverting r271940.
https://bugs.webkit.org/show_bug.cgi?id=221040

Some tests are failing on bots

Reverted changeset:

"[MacOS] Enable NSURLSession WebSocket code path in
WebKitTestRunner"
https://bugs.webkit.org/show_bug.cgi?id=220973
https://trac.webkit.org/changeset/271940

Modified Paths

Removed Paths

  • trunk/LayoutTests/platform/mac-bigsur-wk2/

Diff

Modified: trunk/LayoutTests/ChangeLog (271949 => 271950)


--- trunk/LayoutTests/ChangeLog	2021-01-27 14:17:42 UTC (rev 271949)
+++ trunk/LayoutTests/ChangeLog	2021-01-27 14:21:09 UTC (rev 271950)
@@ -1,3 +1,17 @@
+2021-01-27  Commit Queue  <[email protected]>
+
+        Unreviewed, reverting r271940.
+        https://bugs.webkit.org/show_bug.cgi?id=221040
+
+        Some tests are failing on bots
+
+        Reverted changeset:
+
+        "[MacOS] Enable NSURLSession WebSocket code path in
+        WebKitTestRunner"
+        https://bugs.webkit.org/show_bug.cgi?id=220973
+        https://trac.webkit.org/changeset/271940
+
 2021-01-27  Rob Buis  <[email protected]>
 
         Handle zero aspect-ratio width/height

Modified: trunk/LayoutTests/platform/mac/TestExpectations (271949 => 271950)


--- trunk/LayoutTests/platform/mac/TestExpectations	2021-01-27 14:17:42 UTC (rev 271949)
+++ trunk/LayoutTests/platform/mac/TestExpectations	2021-01-27 14:21:09 UTC (rev 271950)
@@ -642,7 +642,6 @@
 webkit.org/b/131715 transitions/cancel-transition.html [ Pass Failure ]
 
 webkit.org/b/89153 http/tests/websocket/tests/hybi/workers/close.html [ Pass Failure ]
-[ BigSur+ ] http/tests/websocket/tests/hybi/bad-handshake-crash.html [ Timeout ]
 
 # <rdar://problem/16696298>
 webkit.org/b/131886 webgl/1.0.3/conformance/textures/texture-size-limit.html [ Pass Failure ]

Modified: trunk/Source/WebKit/ChangeLog (271949 => 271950)


--- trunk/Source/WebKit/ChangeLog	2021-01-27 14:17:42 UTC (rev 271949)
+++ trunk/Source/WebKit/ChangeLog	2021-01-27 14:21:09 UTC (rev 271950)
@@ -1,3 +1,17 @@
+2021-01-27  Commit Queue  <[email protected]>
+
+        Unreviewed, reverting r271940.
+        https://bugs.webkit.org/show_bug.cgi?id=221040
+
+        Some tests are failing on bots
+
+        Reverted changeset:
+
+        "[MacOS] Enable NSURLSession WebSocket code path in
+        WebKitTestRunner"
+        https://bugs.webkit.org/show_bug.cgi?id=220973
+        https://trac.webkit.org/changeset/271940
+
 2021-01-27  Per Arne  <[email protected]>
 
         Restrict access to syslog in sandbox

Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (271949 => 271950)


--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm	2021-01-27 14:17:42 UTC (rev 271949)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm	2021-01-27 14:21:09 UTC (rev 271950)
@@ -1035,8 +1035,7 @@
 - (void)URLSession:(NSURLSession *)session webSocketTask:(NSURLSessionWebSocketTask *)task didCloseWithCode:(NSURLSessionWebSocketCloseCode)closeCode reason:(NSData *)reason
 {
     if (auto* webSocketTask = [self existingWebSocketTask:task]) {
-        // FIXME: We can re-enable ASSERT below once NSURLSession bug rdar://problem/72383646 is fixed.
-        // ASSERT([reason isEqualToData:task.closeReason]);
+        ASSERT([reason isEqualToData:task.closeReason]);
         ASSERT(closeCode == [task closeCode]);
         auto closeReason = adoptNS([[NSString alloc] initWithData:reason encoding:NSUTF8StringEncoding]);
         webSocketTask->didClose(closeCode, closeReason.get());

Modified: trunk/Tools/ChangeLog (271949 => 271950)


--- trunk/Tools/ChangeLog	2021-01-27 14:17:42 UTC (rev 271949)
+++ trunk/Tools/ChangeLog	2021-01-27 14:21:09 UTC (rev 271950)
@@ -1,3 +1,17 @@
+2021-01-27  Commit Queue  <[email protected]>
+
+        Unreviewed, reverting r271940.
+        https://bugs.webkit.org/show_bug.cgi?id=221040
+
+        Some tests are failing on bots
+
+        Reverted changeset:
+
+        "[MacOS] Enable NSURLSession WebSocket code path in
+        WebKitTestRunner"
+        https://bugs.webkit.org/show_bug.cgi?id=220973
+        https://trac.webkit.org/changeset/271940
+
 2021-01-27  Carlos Garcia Campos  <[email protected]>
 
         [GTK] Test /webkit/WebKitSettings/webkit-settings is failing since r271354

Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (271949 => 271950)


--- trunk/Tools/WebKitTestRunner/TestController.cpp	2021-01-27 14:17:42 UTC (rev 271949)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp	2021-01-27 14:21:09 UTC (rev 271950)
@@ -901,9 +901,7 @@
     WKPreferencesSetHiddenPageDOMTimerThrottlingEnabled(preferences, false);
     WKPreferencesSetHiddenPageCSSAnimationSuspensionEnabled(preferences, false);
     WKPreferencesSetStorageBlockingPolicy(preferences, kWKAllowAllStorage); // FIXME: We should be testing the default.
-#if PLATFORM(IOS_FAMILY)
     WKPreferencesSetIsNSURLSessionWebSocketEnabled(preferences, false);
-#endif
     WKPreferencesSetWebRTCPlatformCodecsInGPUProcessEnabled(preferences, false);
     WKPreferencesSetFetchAPIKeepAliveEnabled(preferences, true);
     WKPreferencesSetMediaPreloadingEnabled(preferences, true);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to