Title: [287275] trunk
- Revision
- 287275
- Author
- achristen...@apple.com
- Date
- 2021-12-20 13:58:38 -0800 (Mon, 20 Dec 2021)
Log Message
[ Monterey ] TestWebKitAPI.WebSocket.PageWithAttributedBundleIdentifierDestroyed (API-test) is a constant timeout
https://bugs.webkit.org/show_bug.cgi?id=233224
Reviewed by Darin Adler.
Source/WebKit:
Using NSURLSession._attributedBundleIdentifier requires the com.apple.private.network.socket-delegate entitlement,
which can't be signed into the network process with the public SDK.
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(WebKit::NetworkSessionCocoa::addWebPageNetworkParameters):
Tools:
* TestWebKitAPI/Tests/WebKitCocoa/WebSocket.mm:
(TestWebKitAPI::TEST):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (287274 => 287275)
--- trunk/Source/WebKit/ChangeLog 2021-12-20 21:36:06 UTC (rev 287274)
+++ trunk/Source/WebKit/ChangeLog 2021-12-20 21:58:38 UTC (rev 287275)
@@ -1,3 +1,16 @@
+2021-12-20 Alex Christensen <achristen...@webkit.org>
+
+ [ Monterey ] TestWebKitAPI.WebSocket.PageWithAttributedBundleIdentifierDestroyed (API-test) is a constant timeout
+ https://bugs.webkit.org/show_bug.cgi?id=233224
+
+ Reviewed by Darin Adler.
+
+ Using NSURLSession._attributedBundleIdentifier requires the com.apple.private.network.socket-delegate entitlement,
+ which can't be signed into the network process with the public SDK.
+
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (WebKit::NetworkSessionCocoa::addWebPageNetworkParameters):
+
2021-12-20 Wenson Hsieh <wenson_hs...@apple.com>
Minor cleanup in AuthenticationServicesCoreSPI.h
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (287274 => 287275)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2021-12-20 21:36:06 UTC (rev 287274)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2021-12-20 21:58:38 UTC (rev 287275)
@@ -1763,7 +1763,7 @@
auto addResult2 = m_perPageSessionSets.add(pageID, SessionSet::create());
ASSERT(addResult2.isNewEntry);
RetainPtr<NSURLSessionConfiguration> configuration = adoptNS([m_defaultSessionSet->sessionWithCredentialStorage.session.get().configuration copy]);
-#if HAVE(CFNETWORK_NSURLSESSION_ATTRIBUTED_BUNDLE_IDENTIFIER)
+#if HAVE(CFNETWORK_NSURLSESSION_ATTRIBUTED_BUNDLE_IDENTIFIER) && USE(APPLE_INTERNAL_SDK)
if ([configuration respondsToSelector:@selector(_attributedBundleIdentifier)])
configuration.get()._attributedBundleIdentifier = parameters.attributedBundleIdentifier();
#endif
Modified: trunk/Tools/ChangeLog (287274 => 287275)
--- trunk/Tools/ChangeLog 2021-12-20 21:36:06 UTC (rev 287274)
+++ trunk/Tools/ChangeLog 2021-12-20 21:58:38 UTC (rev 287275)
@@ -1,3 +1,13 @@
+2021-12-20 Alex Christensen <achristen...@webkit.org>
+
+ [ Monterey ] TestWebKitAPI.WebSocket.PageWithAttributedBundleIdentifierDestroyed (API-test) is a constant timeout
+ https://bugs.webkit.org/show_bug.cgi?id=233224
+
+ Reviewed by Darin Adler.
+
+ * TestWebKitAPI/Tests/WebKitCocoa/WebSocket.mm:
+ (TestWebKitAPI::TEST):
+
2021-12-20 Tim Nguyen <n...@apple.com>
Stop assuming WPT is a reftest based on existence of -ref.html file
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebSocket.mm (287274 => 287275)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebSocket.mm 2021-12-20 21:36:06 UTC (rev 287274)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebSocket.mm 2021-12-20 21:58:38 UTC (rev 287275)
@@ -86,12 +86,7 @@
EXPECT_WK_STREQ([webView _test_waitForAlert], "PASS");
}
-// FIXME: Re-enable this test for Monterey+ once webkit.org/b/233224 is resolved.
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000
-TEST(WebSocket, DISABLED_PageWithAttributedBundleIdentifierDestroyed)
-#else
TEST(WebSocket, PageWithAttributedBundleIdentifierDestroyed)
-#endif
{
HTTPServer server([](Connection connection) {
connection.webSocketHandshake();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
