From fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:14:29 +0200 Subject: Merging upstream version 125.0.1. Signed-off-by: Daniel Baumann --- .../passwordmgr/test/browser/browser.toml | 49 +++++++++++++--------- 1 file changed, 29 insertions(+), 20 deletions(-) (limited to 'toolkit/components/passwordmgr/test/browser/browser.toml') diff --git a/toolkit/components/passwordmgr/test/browser/browser.toml b/toolkit/components/passwordmgr/test/browser/browser.toml index 53066c92d4..77c107c6f3 100644 --- a/toolkit/components/passwordmgr/test/browser/browser.toml +++ b/toolkit/components/passwordmgr/test/browser/browser.toml @@ -36,8 +36,9 @@ support-files = [ ["browser_DOMInputPasswordAdded.js"] skip-if = [ - "os == 'linux'", # Bug 1337606 - "os == 'mac'", # Bug 1337606 + "os == 'linux' && os_version == '18.04'", # Bug 1337606 + "apple_catalina", # Bug 1337606 + "apple_silicon", # Bug 1337606 ] ["browser_autocomplete_autofocus_with_frame.js"] @@ -47,15 +48,17 @@ support-files = ["form_autofocus_frame.html"] support-files = ["form_disabled_readonly_passwordField.html"] ["browser_autocomplete_footer.js"] -skip-if = ["!debug && os == 'linux' && bits == 64 && os_version == '18.04'"] # Bug 1591126 +skip-if = ["os == 'linux' && os_version == '18.04' && bits == 64 && !debug"] # Bug 1591126 ["browser_autocomplete_generated_password_private_window.js"] ["browser_autocomplete_import.js"] https_first_disabled = true skip-if = [ - "os == 'mac'", # Bug 1775902 - "os == 'win' && !debug", # Bug 1775902 + "apple_catalina", # Bug 1775902 + "apple_silicon", # Bug 1775902 + "win10_2009 && !debug", # Bug 1775902 + "win11_2009 && !debug", # Bug 1775902 ] ["browser_autocomplete_insecure_warning.js"] @@ -64,8 +67,7 @@ skip-if = [ ["browser_autofill_hidden_document.js"] skip-if = [ - "os == 'win' && os_version == '10.0' && debug", # bug 1530935 - "apple_catalina && fission && !debug", # high frequency intermittent, Bug 1716486 + "apple_catalina && !debug", # high frequency intermittent, Bug 1716486 ] ["browser_autofill_http.js"] @@ -81,7 +83,10 @@ skip-if = ["os == 'android'"] ["browser_basicAuth_rateLimit.js"] ["browser_basicAuth_switchTab.js"] -skip-if = ["debug && os == 'mac'"] # Bug 1530566 +skip-if = [ + "apple_catalina && debug", # Bug 1530566 + "apple_silicon && debug", # Bug 1530566 +] ["browser_context_menu.js"] @@ -121,9 +126,10 @@ support-files = [ "form_password_change.html", ] skip-if = [ - "os == 'linux'", # Bug 1729196 + "os == 'linux' && os_version == '18.04'", # Bug 1729196 "win11_2009 && bits == 64", # Bug 1729196 - "os == 'mac' && debug", # Bug 1729196 + "apple_catalina && debug", # Bug 1729196 + "apple_silicon && debug", # Bug 1729196 ] ["browser_doorhanger_httpsUpgrade.js"] @@ -149,8 +155,8 @@ skip-if = ["a11y_checks"] # Bugs 1858041, 1854454 and 1824058 for causing interm fail-if = ["a11y_checks"] # Bug 1854452 clicked dropmaker may not be focusable skip-if = [ "tsan", # Bug 1661305 - "os == 'linux' && debug", # Bug 1658056 - "os == 'linux' && asan", # Bug 1695395 + "os == 'linux' && os_version == '18.04' && debug", # Bug 1658056 + "os == 'linux' && os_version == '18.04' && asan", # Bug 1695395 ] ["browser_doorhanger_target_blank.js"] @@ -165,7 +171,7 @@ support-files = [ "subtst_notifications_11.html", "subtst_notifications_11_popup.html", ] -skip-if = ["os == 'linux'"] # Bug 1312981, bug 1313136 +skip-if = ["os == 'linux' && os_version == '18.04'"] # Bug 1312981, bug 1313136 ["browser_entry_point_telemetry.js"] @@ -178,7 +184,7 @@ support-files = ["file_focus_before_DOMContentLoaded.sjs"] ["browser_form_history_fallback.js"] https_first_disabled = true # TODO remove that line and move test to HTTPS, see Bug 1776350 -skip-if = ["os == 'linux' && debug"] # Bug 1334336 +skip-if = ["os == 'linux' && os_version == '18.04' && debug"] # Bug 1334336 support-files = [ "subtst_notifications_1.html", "subtst_notifications_2.html", @@ -208,8 +214,9 @@ support-files = ["form_signup_detection.html"] ["browser_localip_frame.js"] skip-if = [ - "os == 'mac' && bits == 64", # Bug 1683848 - "os == 'linux' && !debug && bits == 64", # Bug 1683848 + "apple_catalina", # Bug 1683848 + "apple_silicon", # Bug 1683848 + "os == 'linux' && os_version == '18.04' && bits == 64 && !debug", # Bug 1683848 ] ["browser_message_onFormSubmit.js"] @@ -219,8 +226,11 @@ skip-if = [ ["browser_preselect_login.js"] fail-if = ["a11y_checks"] # Bug 1854452 clicked ac-secondary-action may not be labeled skip-if = [ - "os == 'linux' && (asan || tsan || debug)", # Bug 1840479 - "os == 'win' && (asan || debug)", # Bug 1840479 + "asan", + "tsan", + "os == 'linux' && os_version == '18.04' && debug", # Bug 1840479 + "win10_2009 && debug", # Bug 1840479 + "win11_2009 && debug", # Bug 1840479 ] ["browser_private_window.js"] @@ -229,8 +239,7 @@ support-files = [ "form_password_change.html", ] skip-if = [ - "os == 'linux' && bits == 64 && os_version == '18.04' && !debug", # Bug 1744976 - "os == 'win' && os_version == '10.0' && debug", # Bug 1782656 + "os == 'linux' && os_version == '18.04' && bits == 64 && !debug", # Bug 1744976 ] ["browser_proxyAuth_prompt.js"] -- cgit v1.2.3