From e960a7761ba317cedc8be265add7c3e5c7d1eb93 Mon Sep 17 00:00:00 2001 From: Alexandra Borovova Date: Wed, 22 May 2024 07:56:25 +0000 Subject: [PATCH] Bug 1524074 - Enable "marionette.setpermission.enabled" preference for wpt tests. r=webdriver-reviewers,whimboo Differential Revision: https://phabricator.services.mozilla.com/D210608 --- testing/profiles/web-platform/user.js | 3 +++ .../meta/clipboard-apis/__dir__.ini | 2 +- .../PositionOptions.https.html.ini | 17 ++--------------- ...led-by-permissions-policy.https.sub.html.ini | 9 +-------- ...led-by-permissions-policy.https.sub.html.ini | 9 +-------- ...gin-by-permissions-policy.https.sub.html.ini | 9 +-------- ...rentPosition_permission_allow.https.html.ini | 4 ++-- ...rrentPosition_permission_deny.https.html.ini | 3 --- .../non-fully-active.https.html.ini | 3 --- ...watchPosition_permission_deny.https.html.ini | 9 --------- .../testdriver/set_permission.https.html.ini | 8 -------- .../notifications/event-onclose.https.html.ini | 2 +- .../notifications/event-onshow.https.html.ini | 2 +- ...cations-across-processes.https.window.js.ini | 2 +- .../notifications/instance.https.window.js.ini | 2 +- .../shownotification-window.https.html.ini | 2 +- ...ation-without-permission.https.window.js.ini | 1 - .../shownotification.https.window.js.ini | 2 +- .../meta/notifications/tag.https.html.ini | 2 +- .../permissions/permissions-cg.https.html.ini | 4 ---- .../permissions-garbage-collect.https.html.ini | 4 ---- testing/web-platform/meta/push-api/__dir__.ini | 2 +- .../meta/screen-wake-lock/__dir__.ini | 2 +- .../meta/storage-access-api/__dir__.ini | 4 ++-- .../meta/webmidi/idlharness.https.window.js.ini | 3 ++- .../testdriver/set_permission.https.html.ini | 4 ++-- 26 files changed, 26 insertions(+), 88 deletions(-) delete mode 100644 testing/web-platform/meta/geolocation-API/watchPosition_permission_deny.https.html.ini delete mode 100644 testing/web-platform/meta/infrastructure/testdriver/set_permission.https.html.ini delete mode 100644 testing/web-platform/meta/notifications/shownotification-without-permission.https.window.js.ini delete mode 100644 testing/web-platform/meta/permissions/permissions-cg.https.html.ini delete mode 100644 testing/web-platform/meta/permissions/permissions-garbage-collect.https.html.ini diff --git a/testing/profiles/web-platform/user.js b/testing/profiles/web-platform/user.js index 29cbd329210b..9654efb91800 100644 --- a/testing/profiles/web-platform/user.js +++ b/testing/profiles/web-platform/user.js @@ -96,3 +96,6 @@ user_pref("network.captive-portal-service.enabled", false); user_pref("network.http.http2.websockets", true); // Turn off update user_pref("app.update.disabledForTesting", true); +// Enable setPermission API in Marionette. +// This preference will be removed with a fix on bug 1897180. +user_pref("marionette.setpermission.enabled", true); diff --git a/testing/web-platform/meta/clipboard-apis/__dir__.ini b/testing/web-platform/meta/clipboard-apis/__dir__.ini index cc1333cccf5e..0e5a094b0eca 100644 --- a/testing/web-platform/meta/clipboard-apis/__dir__.ini +++ b/testing/web-platform/meta/clipboard-apis/__dir__.ini @@ -1 +1 @@ -prefs: [dom.events.asyncClipboard.clipboardItem: true, dom.events.asyncClipboard.readText: true, marionette.setpermission.enabled:true] +prefs: [dom.events.asyncClipboard.clipboardItem: true, dom.events.asyncClipboard.readText: true] diff --git a/testing/web-platform/meta/geolocation-API/PositionOptions.https.html.ini b/testing/web-platform/meta/geolocation-API/PositionOptions.https.html.ini index d2fba3eb7bf5..6d7517d849c5 100644 --- a/testing/web-platform/meta/geolocation-API/PositionOptions.https.html.ini +++ b/testing/web-platform/meta/geolocation-API/PositionOptions.https.html.ini @@ -1,19 +1,6 @@ [PositionOptions.https.html] - expected: ERROR - [Call getCurrentPosition with wrong type for enableHighAccuracy. No exception expected.] + [Set timeout and maximumAge to 0, check that timeout error raised (watchPosition)] expected: FAIL - [Call watchPosition with wrong type for enableHighAccuracy. No exception expected.] - expected: NOTRUN - - [Set timeout and maximumAge to 0, check that timeout error raised (getCurrentPosition)] - expected: NOTRUN - - [Set timeout and maximumAge to 0, check that timeout error raised (watchPosition)] - expected: NOTRUN - - [Check that a negative timeout and maxAge values are clamped to 0 (getCurrentPosition)] - expected: NOTRUN - [Check that a negative timeout and maxAge values are clamped to 0 (watchPosition)] - expected: NOTRUN + expected: FAIL diff --git a/testing/web-platform/meta/geolocation-API/disabled-by-permissions-policy.https.sub.html.ini b/testing/web-platform/meta/geolocation-API/disabled-by-permissions-policy.https.sub.html.ini index 3af42ce78e8c..54c4d98ce550 100644 --- a/testing/web-platform/meta/geolocation-API/disabled-by-permissions-policy.https.sub.html.ini +++ b/testing/web-platform/meta/geolocation-API/disabled-by-permissions-policy.https.sub.html.ini @@ -1,10 +1,3 @@ [disabled-by-permissions-policy.https.sub.html] - expected: ERROR [Permissions-Policy header geolocation=() disallows the top-level document.] - expected: NOTRUN - - [Permissions-Policy header geolocation=() disallows same-origin iframes.] - expected: NOTRUN - - [Permissions-Policy header geolocation=() disallows cross-origin iframes.] - expected: NOTRUN + expected: FAIL diff --git a/testing/web-platform/meta/geolocation-API/enabled-by-permissions-policy.https.sub.html.ini b/testing/web-platform/meta/geolocation-API/enabled-by-permissions-policy.https.sub.html.ini index 1dbd4615b4a0..f79e89c7047e 100644 --- a/testing/web-platform/meta/geolocation-API/enabled-by-permissions-policy.https.sub.html.ini +++ b/testing/web-platform/meta/geolocation-API/enabled-by-permissions-policy.https.sub.html.ini @@ -1,10 +1,3 @@ [enabled-by-permissions-policy.https.sub.html] - expected: ERROR [Permissions-Policy header geolocation=* allows the top-level document.] - expected: NOTRUN - - [Permissions-Policy header geolocation=* allows same-origin iframes.] - expected: NOTRUN - - [Permissions-Policy header geolocation=* allows cross-origin iframes.] - expected: NOTRUN + expected: FAIL diff --git a/testing/web-platform/meta/geolocation-API/enabled-on-self-origin-by-permissions-policy.https.sub.html.ini b/testing/web-platform/meta/geolocation-API/enabled-on-self-origin-by-permissions-policy.https.sub.html.ini index 46b5d536c853..2026125c352a 100644 --- a/testing/web-platform/meta/geolocation-API/enabled-on-self-origin-by-permissions-policy.https.sub.html.ini +++ b/testing/web-platform/meta/geolocation-API/enabled-on-self-origin-by-permissions-policy.https.sub.html.ini @@ -1,10 +1,3 @@ [enabled-on-self-origin-by-permissions-policy.https.sub.html] - expected: ERROR [Permissions-Policy header geolocation=(self) allows the top-level document.] - expected: NOTRUN - - [Permissions-Policy header geolocation=(self) allows same-origin iframes.] - expected: NOTRUN - - [Permissions-Policy header geolocation=(self) disallows cross-origin iframes.] - expected: NOTRUN + expected: FAIL diff --git a/testing/web-platform/meta/geolocation-API/getCurrentPosition_permission_allow.https.html.ini b/testing/web-platform/meta/geolocation-API/getCurrentPosition_permission_allow.https.html.ini index 8214b2272496..53d527a87542 100644 --- a/testing/web-platform/meta/geolocation-API/getCurrentPosition_permission_allow.https.html.ini +++ b/testing/web-platform/meta/geolocation-API/getCurrentPosition_permission_allow.https.html.ini @@ -1,7 +1,7 @@ [getCurrentPosition_permission_allow.https.html] - expected: ERROR + expected: TIMEOUT [User allows access, check that success callback is called.] expected: FAIL [Error callback is nullable for getCurrentPosition().] - expected: NOTRUN + expected: TIMEOUT diff --git a/testing/web-platform/meta/geolocation-API/getCurrentPosition_permission_deny.https.html.ini b/testing/web-platform/meta/geolocation-API/getCurrentPosition_permission_deny.https.html.ini index ab4792350319..c49133e2e185 100644 --- a/testing/web-platform/meta/geolocation-API/getCurrentPosition_permission_deny.https.html.ini +++ b/testing/web-platform/meta/geolocation-API/getCurrentPosition_permission_deny.https.html.ini @@ -1,6 +1,3 @@ [getCurrentPosition_permission_deny.https.html] - expected: - if (os == "android") and fission: [ERROR, TIMEOUT] - ERROR [User denies access, check that error callback is called with correct code] expected: FAIL diff --git a/testing/web-platform/meta/geolocation-API/non-fully-active.https.html.ini b/testing/web-platform/meta/geolocation-API/non-fully-active.https.html.ini index ac1c4f2abe3f..c1d3c2105fe5 100644 --- a/testing/web-platform/meta/geolocation-API/non-fully-active.https.html.ini +++ b/testing/web-platform/meta/geolocation-API/non-fully-active.https.html.ini @@ -1,6 +1,3 @@ [non-fully-active.https.html] - expected: - if (os == "android") and fission: [ERROR, TIMEOUT] - ERROR [non-fully active document behavior] expected: FAIL diff --git a/testing/web-platform/meta/geolocation-API/watchPosition_permission_deny.https.html.ini b/testing/web-platform/meta/geolocation-API/watchPosition_permission_deny.https.html.ini deleted file mode 100644 index 2bf06d7d9b15..000000000000 --- a/testing/web-platform/meta/geolocation-API/watchPosition_permission_deny.https.html.ini +++ /dev/null @@ -1,9 +0,0 @@ -[watchPosition_permission_deny.https.html] - expected: - if (os == "android") and fission: [ERROR, TIMEOUT] - ERROR - [Check that watchPosition returns synchronously before any callbacks are invoked.] - expected: FAIL - - [User denies access, check that error callback is called.] - expected: NOTRUN diff --git a/testing/web-platform/meta/infrastructure/testdriver/set_permission.https.html.ini b/testing/web-platform/meta/infrastructure/testdriver/set_permission.https.html.ini deleted file mode 100644 index 6fe117154ae4..000000000000 --- a/testing/web-platform/meta/infrastructure/testdriver/set_permission.https.html.ini +++ /dev/null @@ -1,8 +0,0 @@ -[set_permission.https.html] - expected: - if (os == "android") and fission: [OK, TIMEOUT] - [Grant Permission] - expected: FAIL - - [Deny Permission] - expected: FAIL diff --git a/testing/web-platform/meta/notifications/event-onclose.https.html.ini b/testing/web-platform/meta/notifications/event-onclose.https.html.ini index 876798c9dac6..4acd13c08126 100644 --- a/testing/web-platform/meta/notifications/event-onclose.https.html.ini +++ b/testing/web-platform/meta/notifications/event-onclose.https.html.ini @@ -1,4 +1,4 @@ -prefs: [notification.prompt.testing:true,marionette.setpermission.enabled:true] +prefs: [notification.prompt.testing:true] [event-onclose.https.html] bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1816427 diff --git a/testing/web-platform/meta/notifications/event-onshow.https.html.ini b/testing/web-platform/meta/notifications/event-onshow.https.html.ini index b9b78c9bfecb..11d42292dec7 100644 --- a/testing/web-platform/meta/notifications/event-onshow.https.html.ini +++ b/testing/web-platform/meta/notifications/event-onshow.https.html.ini @@ -1,4 +1,4 @@ -prefs: [notification.prompt.testing:true,marionette.setpermission.enabled:true] +prefs: [notification.prompt.testing:true] [event-onshow.https.html] bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1816427 diff --git a/testing/web-platform/meta/notifications/getnotifications-across-processes.https.window.js.ini b/testing/web-platform/meta/notifications/getnotifications-across-processes.https.window.js.ini index f88a3148a64e..2aa412be7cb8 100644 --- a/testing/web-platform/meta/notifications/getnotifications-across-processes.https.window.js.ini +++ b/testing/web-platform/meta/notifications/getnotifications-across-processes.https.window.js.ini @@ -1,4 +1,4 @@ -prefs: [notification.prompt.testing:true, marionette.setpermission.enabled:true, dom.webnotifications.loglevel:All] +prefs: [notification.prompt.testing:true, dom.webnotifications.loglevel:All] [getnotifications-across-processes.https.window.html] [Get notification created from window] expected: diff --git a/testing/web-platform/meta/notifications/instance.https.window.js.ini b/testing/web-platform/meta/notifications/instance.https.window.js.ini index f8f64b3273c9..15c433e99c63 100644 --- a/testing/web-platform/meta/notifications/instance.https.window.js.ini +++ b/testing/web-platform/meta/notifications/instance.https.window.js.ini @@ -1,4 +1,4 @@ -prefs: [notification.prompt.testing:true, marionette.setpermission.enabled:true] +prefs: [notification.prompt.testing:true] [instance.https.window.html] expected: if (os == "linux") and not debug and not asan and not tsan: [OK, TIMEOUT] diff --git a/testing/web-platform/meta/notifications/shownotification-window.https.html.ini b/testing/web-platform/meta/notifications/shownotification-window.https.html.ini index c6c62a39be65..91bbd5c04220 100644 --- a/testing/web-platform/meta/notifications/shownotification-window.https.html.ini +++ b/testing/web-platform/meta/notifications/shownotification-window.https.html.ini @@ -1 +1 @@ -prefs: [notification.prompt.testing:true, marionette.setpermission.enabled:true] +prefs: [notification.prompt.testing:true] diff --git a/testing/web-platform/meta/notifications/shownotification-without-permission.https.window.js.ini b/testing/web-platform/meta/notifications/shownotification-without-permission.https.window.js.ini deleted file mode 100644 index 15533cd2e6b2..000000000000 --- a/testing/web-platform/meta/notifications/shownotification-without-permission.https.window.js.ini +++ /dev/null @@ -1 +0,0 @@ -prefs: [marionette.setpermission.enabled:true] diff --git a/testing/web-platform/meta/notifications/shownotification.https.window.js.ini b/testing/web-platform/meta/notifications/shownotification.https.window.js.ini index 552940655fda..de1757de49ee 100644 --- a/testing/web-platform/meta/notifications/shownotification.https.window.js.ini +++ b/testing/web-platform/meta/notifications/shownotification.https.window.js.ini @@ -1,4 +1,4 @@ -prefs: [notification.prompt.testing:true, marionette.setpermission.enabled:true] +prefs: [notification.prompt.testing:true] [getnotifications-across-processes.https.window.html] [Get notification created from window] expected: diff --git a/testing/web-platform/meta/notifications/tag.https.html.ini b/testing/web-platform/meta/notifications/tag.https.html.ini index 274e91c6f7ef..f5dc401a044b 100644 --- a/testing/web-platform/meta/notifications/tag.https.html.ini +++ b/testing/web-platform/meta/notifications/tag.https.html.ini @@ -1,4 +1,4 @@ -prefs: [notification.prompt.testing:true,marionette.setpermission.enabled:true] +prefs: [notification.prompt.testing:true] [tag.https.html] bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1891536 diff --git a/testing/web-platform/meta/permissions/permissions-cg.https.html.ini b/testing/web-platform/meta/permissions/permissions-cg.https.html.ini deleted file mode 100644 index a36107c9c341..000000000000 --- a/testing/web-platform/meta/permissions/permissions-cg.https.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[permissions-cg.https.html] - expected: ERROR - [status is not garbage collected when it goes out of scope] - expected: TIMEOUT diff --git a/testing/web-platform/meta/permissions/permissions-garbage-collect.https.html.ini b/testing/web-platform/meta/permissions/permissions-garbage-collect.https.html.ini deleted file mode 100644 index 66d6b20c582a..000000000000 --- a/testing/web-platform/meta/permissions/permissions-garbage-collect.https.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[permissions-garbage-collect.https.html] - expected: ERROR - [Events fire even if the status object is garbage collected] - expected: FAIL diff --git a/testing/web-platform/meta/push-api/__dir__.ini b/testing/web-platform/meta/push-api/__dir__.ini index eb71c8c7f42b..8ec9fa6488e0 100644 --- a/testing/web-platform/meta/push-api/__dir__.ini +++ b/testing/web-platform/meta/push-api/__dir__.ini @@ -1,4 +1,4 @@ # https://bugzilla.mozilla.org/show_bug.cgi?id=1497427 implementation-status: backlog lsan-allowed: [Alloc, Create, Malloc, Realloc, Then, mozilla::BasePrincipal::CreateContentPrincipal, mozilla::dom::DocGroup::Create, mozilla::dom::ServiceWorkerManager::Unregister, mozilla::dom::ServiceWorkerRegistrationMainThread::Unregister, mozilla::dom::UnregisterCallback::UnregisterCallback, mozilla::net::nsStandardURL::TemplatedMutator, operator] -prefs: [notification.prompt.testing:true, dom.push.testing.ignorePermission:true, marionette.setpermission.enabled:true] +prefs: [notification.prompt.testing:true, dom.push.testing.ignorePermission:true] diff --git a/testing/web-platform/meta/screen-wake-lock/__dir__.ini b/testing/web-platform/meta/screen-wake-lock/__dir__.ini index 94ad11e4f637..2512252a982f 100644 --- a/testing/web-platform/meta/screen-wake-lock/__dir__.ini +++ b/testing/web-platform/meta/screen-wake-lock/__dir__.ini @@ -1 +1 @@ -prefs: [marionette.setpermission.enabled:true, dom.screenwakelock.enabled:true] +prefs: [dom.screenwakelock.enabled:true] diff --git a/testing/web-platform/meta/storage-access-api/__dir__.ini b/testing/web-platform/meta/storage-access-api/__dir__.ini index 96bfb47246d0..75bade0d28d6 100644 --- a/testing/web-platform/meta/storage-access-api/__dir__.ini +++ b/testing/web-platform/meta/storage-access-api/__dir__.ini @@ -1,3 +1,3 @@ prefs: - if os == "android": [marionette.setpermission.enabled:true, dom.storage_access.auto_grants:false, dom.storage_access.prompt.testing:true, dom.storage_access.prompt.testing.allow:false, network.cookie.cookieBehavior:5] - [marionette.setpermission.enabled:true, dom.storage_access.auto_grants:false, dom.storage_access.prompt.testing:true, dom.storage_access.prompt.testing.allow:false] + if os == "android": [dom.storage_access.auto_grants:false, dom.storage_access.prompt.testing:true, dom.storage_access.prompt.testing.allow:false, network.cookie.cookieBehavior:5] + [dom.storage_access.auto_grants:false, dom.storage_access.prompt.testing:true, dom.storage_access.prompt.testing.allow:false] diff --git a/testing/web-platform/meta/webmidi/idlharness.https.window.js.ini b/testing/web-platform/meta/webmidi/idlharness.https.window.js.ini index 51a142ae1ce9..e971f5fcf79d 100644 --- a/testing/web-platform/meta/webmidi/idlharness.https.window.js.ini +++ b/testing/web-platform/meta/webmidi/idlharness.https.window.js.ini @@ -232,7 +232,8 @@ if os == "android": FAIL [idl_test setup] - expected: FAIL + expected: + if os == "android": FAIL [MIDIConnectionEvent interface: existence and properties of interface object] expected: diff --git a/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/set_permission.https.html.ini b/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/set_permission.https.html.ini index 026e6823515d..2336cb7da4a0 100644 --- a/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/set_permission.https.html.ini +++ b/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/set_permission.https.html.ini @@ -1,8 +1,8 @@ [set_permission.https.html] [Grant Permission] expected: - if product != "chrome": FAIL + if product != "safari": FAIL [Deny Permission] expected: - if product != "chrome": FAIL + if product != "safari": FAIL