Bug 1524074 - Enable "marionette.setpermission.enabled" preference fo…

…r wpt tests. r=webdriver-reviewers,whimboo Differential Revision: https://phabricator.services.mozilla.com/D210608
Brli · May 22, 2024 · beb16d8 · beb16d8
1 parent fa621ca
commit beb16d8
Show file tree

Hide file tree

Showing 26 changed files with 26 additions and 88 deletions.
diff --git 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
@@ -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
@@ -1,19 +1,6 @@
 [PositionOptions.https.html]
-  expected: ERROR
-  [Call getCurrentPosition with wrong type for enableHighAccuracy. No exception expected.]
-    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
+    expected: FAIL
 
   [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
@@ -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
@@ -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/...form/meta/geolocation-API/enabled-on-self-origin-by-permissions-policy.https.sub.html.ini b/...form/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
@@ -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
@@ -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
@@ -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
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
diff --git 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
@@ -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/...ing/web-platform/meta/notifications/getnotifications-across-processes.https.window.js.ini b/...ing/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
@@ -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
@@ -1 +1 @@
-prefs: [notification.prompt.testing:true, marionette.setpermission.enabled:true]
+prefs: [notification.prompt.testing:true]
diff --git a/...g/web-platform/meta/notifications/shownotification-without-permission.https.window.js.ini b/...g/web-platform/meta/notifications/shownotification-without-permission.https.window.js.ini
diff --git 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
@@ -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
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
diff --git 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
@@ -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
@@ -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
@@ -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/...orm/tests/infrastructure/metadata/infrastructure/testdriver/set_permission.https.html.ini b/...orm/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
Original file line number	Diff line number	Diff line change
		@@ -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]
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		prefs: [notification.prompt.testing:true, marionette.setpermission.enabled:true]
		prefs: [notification.prompt.testing:true]
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		prefs: [marionette.setpermission.enabled:true, dom.screenwakelock.enabled:true]
		prefs: [dom.screenwakelock.enabled:true]