From c97706cc9af7e7e02841b32bf22c6b065a051e6c Mon Sep 17 00:00:00 2001 From: David P Date: Fri, 17 Jan 2025 17:59:42 +0000 Subject: [PATCH] Bug 1937188: Set geo.prompt.open_system_prefs=false in wpt tests r=saschanaz,jgraham geo.prompt.open_system_prefs keeps the tests from opening system preferences for the user and waiting for them to turn on location services (which obviously will never happen). This is currently only relevant on Windows. Differential Revision: https://phabricator.services.mozilla.com/D232771 --- testing/profiles/web-platform/user.js | 4 ++++ .../meta/geolocation/PositionOptions.https.html.ini | 4 ---- ...ssion-policy-attribute-redirect-on-load.https.sub.html.ini | 4 ---- .../enabled-by-permission-policy-attribute.https.sub.html.ini | 4 ---- .../enabled-by-permissions-policy.https.sub.html.ini | 4 ---- ...ed-on-self-origin-by-permissions-policy.https.sub.html.ini | 3 --- .../getCurrentPosition_permission_allow.https.html.ini | 4 ---- .../meta/geolocation/non-fully-active.https.html.ini | 4 ---- .../web-platform/meta/geolocation/tojson.https.window.js.ini | 4 ---- 9 files changed, 4 insertions(+), 31 deletions(-) delete mode 100644 testing/web-platform/meta/geolocation/enabled-by-permission-policy-attribute.https.sub.html.ini delete mode 100644 testing/web-platform/meta/geolocation/enabled-by-permissions-policy.https.sub.html.ini delete mode 100644 testing/web-platform/meta/geolocation/getCurrentPosition_permission_allow.https.html.ini delete mode 100644 testing/web-platform/meta/geolocation/non-fully-active.https.html.ini diff --git a/testing/profiles/web-platform/user.js b/testing/profiles/web-platform/user.js index e50aabc01904..4a66869fc4c8 100644 --- a/testing/profiles/web-platform/user.js +++ b/testing/profiles/web-platform/user.js @@ -94,3 +94,7 @@ user_pref("network.http.http2.websockets", true); user_pref("app.update.disabledForTesting", true); // Use dummy server for geolocation user_pref("geo.provider.network.url", "https://web-platform.test:8444/_mozilla/geolocation-API/dummy.py"); +// If we are on a platform where we can detect that we don't have OS +// geolocation permission, and we can open it and wait for the user to give +// permission, then don't do that. +user_pref("geo.prompt.open_system_prefs", false); diff --git a/testing/web-platform/meta/geolocation/PositionOptions.https.html.ini b/testing/web-platform/meta/geolocation/PositionOptions.https.html.ini index fe19a3035539..6d7517d849c5 100644 --- a/testing/web-platform/meta/geolocation/PositionOptions.https.html.ini +++ b/testing/web-platform/meta/geolocation/PositionOptions.https.html.ini @@ -1,8 +1,4 @@ [PositionOptions.https.html] - disabled: - if os == 'win' and os_version == '11.26100' and processor == 'x86': bug 1936397 - if os == 'win' and os_version == '11.26100' and processor == 'x86_64': bug 1936397 - [Set timeout and maximumAge to 0, check that timeout error raised (watchPosition)] expected: FAIL diff --git a/testing/web-platform/meta/geolocation/enabled-by-permission-policy-attribute-redirect-on-load.https.sub.html.ini b/testing/web-platform/meta/geolocation/enabled-by-permission-policy-attribute-redirect-on-load.https.sub.html.ini index d7d37fe86c91..ba59c1f69cd7 100644 --- a/testing/web-platform/meta/geolocation/enabled-by-permission-policy-attribute-redirect-on-load.https.sub.html.ini +++ b/testing/web-platform/meta/geolocation/enabled-by-permission-policy-attribute-redirect-on-load.https.sub.html.ini @@ -1,8 +1,4 @@ [enabled-by-permission-policy-attribute-redirect-on-load.https.sub.html] bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1903271 - disabled: - if os == 'win' and os_version == '11.26100' and processor == 'x86': bug 1936397 - if os == 'win' and os_version == '11.26100' and processor == 'x86_64': bug 1936397 - [Permissions-Policy allow="geolocation" allows cross-origin redirection] expected: FAIL diff --git a/testing/web-platform/meta/geolocation/enabled-by-permission-policy-attribute.https.sub.html.ini b/testing/web-platform/meta/geolocation/enabled-by-permission-policy-attribute.https.sub.html.ini deleted file mode 100644 index ce9085eb6425..000000000000 --- a/testing/web-platform/meta/geolocation/enabled-by-permission-policy-attribute.https.sub.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[enabled-by-permission-policy-attribute.https.sub.html] - disabled: - if os == 'win' and os_version == '11.26100' and processor == 'x86': bug 1936397 - if os == 'win' and os_version == '11.26100' and processor == 'x86_64': bug 1936397 diff --git a/testing/web-platform/meta/geolocation/enabled-by-permissions-policy.https.sub.html.ini b/testing/web-platform/meta/geolocation/enabled-by-permissions-policy.https.sub.html.ini deleted file mode 100644 index 098c6970bd7e..000000000000 --- a/testing/web-platform/meta/geolocation/enabled-by-permissions-policy.https.sub.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[enabled-by-permissions-policy.https.sub.html] - disabled: - if os == 'win' and os_version == '11.26100' and processor == 'x86': bug 1936397 - if os == 'win' and os_version == '11.26100' and processor == 'x86_64': bug 1936397 diff --git a/testing/web-platform/meta/geolocation/enabled-on-self-origin-by-permissions-policy.https.sub.html.ini b/testing/web-platform/meta/geolocation/enabled-on-self-origin-by-permissions-policy.https.sub.html.ini index f7aee7626306..04064f64ade2 100644 --- a/testing/web-platform/meta/geolocation/enabled-on-self-origin-by-permissions-policy.https.sub.html.ini +++ b/testing/web-platform/meta/geolocation/enabled-on-self-origin-by-permissions-policy.https.sub.html.ini @@ -1,7 +1,4 @@ [enabled-on-self-origin-by-permissions-policy.https.sub.html] bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1903271 - disabled: - if os == 'win' and os_version == '11.26100' and processor == 'x86': bug 1936397 - if os == 'win' and os_version == '11.26100' and processor == 'x86_64': bug 1936397 [Permissions-Policy header geolocation=(self) disallows cross-origin iframes.] expected: FAIL diff --git a/testing/web-platform/meta/geolocation/getCurrentPosition_permission_allow.https.html.ini b/testing/web-platform/meta/geolocation/getCurrentPosition_permission_allow.https.html.ini deleted file mode 100644 index cb79d0ac220c..000000000000 --- a/testing/web-platform/meta/geolocation/getCurrentPosition_permission_allow.https.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[getCurrentPosition_permission_allow.https.html] - disabled: - if os == 'win' and os_version == '11.26100' and processor == 'x86': bug 1936397 - if os == 'win' and os_version == '11.26100' and processor == 'x86_64': bug 1936397 diff --git a/testing/web-platform/meta/geolocation/non-fully-active.https.html.ini b/testing/web-platform/meta/geolocation/non-fully-active.https.html.ini deleted file mode 100644 index a8f4ace72a58..000000000000 --- a/testing/web-platform/meta/geolocation/non-fully-active.https.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[non-fully-active.https.html] - disabled: - if os == 'win' and os_version == '11.26100' and processor == 'x86': bug 1936397 - if os == 'win' and os_version == '11.26100' and processor == 'x86_64': bug 1936397 diff --git a/testing/web-platform/meta/geolocation/tojson.https.window.js.ini b/testing/web-platform/meta/geolocation/tojson.https.window.js.ini index fad137f4228d..895f0546375e 100644 --- a/testing/web-platform/meta/geolocation/tojson.https.window.js.ini +++ b/testing/web-platform/meta/geolocation/tojson.https.window.js.ini @@ -1,8 +1,4 @@ [tojson.https.window.html] - disabled: - if os == 'win' and os_version == '11.26100' and processor == 'x86': bug 1936397 - if os == 'win' and os_version == '11.26100' and processor == 'x86_64': bug 1936397 - [Test toJSON() in GeolocationPosition and GeolocationCoordinates.] expected: if (os == "mac") and not debug: [PASS, FAIL]