Modified: trunk/Tools/ChangeLog (286439 => 286440)
--- trunk/Tools/ChangeLog 2021-12-02 19:35:49 UTC (rev 286439)
+++ trunk/Tools/ChangeLog 2021-12-02 19:39:41 UTC (rev 286440)
@@ -1,3 +1,16 @@
+2021-12-02 Brady Eidson <beid...@apple.com>
+
+ REGRESSION: r286075 [ Big Sur x86] 2 TestWebKitAPI.WebPushD (API-Tests) are constant failures
+ https://bugs.webkit.org/show_bug.cgi?id=233726
+
+ Unreviewed gardening.
+
+ - Disabling these tests on all Mac platforms until we can figure out the code signing/etc situation
+ - Fix the truly broken "basic" test everywhere by adapting to messaging changes
+
+ * TestWebKitAPI/Tests/WebKitCocoa/WebPushDaemon.mm:
+ (TestWebKitAPI::TEST):
+
2021-12-02 Carlos Garcia Campos <cgar...@igalia.com>
Unreviewed. [GTK] Use nullptr instead of 0 in JSStringCreateWithCharacters()
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebPushDaemon.mm (286439 => 286440)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebPushDaemon.mm 2021-12-02 19:35:49 UTC (rev 286439)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebPushDaemon.mm 2021-12-02 19:39:41 UTC (rev 286440)
@@ -161,8 +161,8 @@
EXPECT_NULL(error);
}
-// FIXME: Re-enable this test for Monterey+ once webkit.org/232857 is resolved.
-#if PLATFORM(MAC) && (__MAC_OS_X_VERSION_MIN_REQUIRED < 110000 || __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000)
+// FIXME: Re-enable this test on Mac once webkit.org/232857 is resolved.
+#if PLATFORM(MAC)
TEST(WebPushD, DISABLED_BasicCommunication)
#else
TEST(WebPushD, BasicCommunication)
@@ -199,15 +199,16 @@
return;
}
- // Send audit token
+ // Send configuration with audit token
{
- std::array<uint8_t, 40> encodedMessage;
+ std::array<uint8_t, 42> encodedMessage;
encodedMessage.fill(0);
- encodedMessage[0] = 32;
- memcpy(&encodedMessage[8], &token, sizeof(token));
+ encodedMessage[1] = 1;
+ encodedMessage[2] = 32;
+ memcpy(&encodedMessage[10], &token, sizeof(token));
auto dictionary = adoptNS(xpc_dictionary_create(nullptr, nullptr, 0));
xpc_dictionary_set_uint64(dictionary.get(), "protocol version", 1);
- xpc_dictionary_set_uint64(dictionary.get(), "message type", 5);
+ xpc_dictionary_set_uint64(dictionary.get(), "message type", 6);
xpc_dictionary_set_data(dictionary.get(), "encoded message", encodedMessage.data(), encodedMessage.size());
xpc_connection_send_message(connection.get(), dictionary.get());
}
@@ -217,7 +218,7 @@
auto dictionary = adoptNS(xpc_dictionary_create(nullptr, nullptr, 0));
std::array<uint8_t, 1> encodedMessage { 1 };
xpc_dictionary_set_uint64(dictionary.get(), "protocol version", 1);
- xpc_dictionary_set_uint64(dictionary.get(), "message type", 6);
+ xpc_dictionary_set_uint64(dictionary.get(), "message type", 5);
xpc_dictionary_set_data(dictionary.get(), "encoded message", encodedMessage.data(), encodedMessage.size());
xpc_connection_send_message(connection.get(), dictionary.get());
@@ -258,8 +259,8 @@
</script>
)WEBPUSHRESOURCE";
-// FIXME: Re-enable this test for Monterey+ once webkit.org/232857 is resolved.
-#if PLATFORM(MAC) && (__MAC_OS_X_VERSION_MIN_REQUIRED < 110000 || __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000)
+// FIXME: Re-enable this test on Mac once webkit.org/232857 is resolved.
+#if PLATFORM(MAC)
TEST(WebPushD, DISABLED_PermissionManagement)
#else
TEST(WebPushD, PermissionManagement)
