Bug 1873732 - remove outdated manifest conditions and use consistent …

…conditions. r=aryx,necko-reviewers,jgilbert,settings-reviewers,credential-management-reviewers,devtools-reviewers,sessionstore-reviewers,dom-storage-reviewers,sgalich,kershaw,nchevobbe,janv,dao Differential Revision: https://phabricator.services.mozilla.com/D198082
dothq · Jan 24, 2024 · 807575f · 807575f
1 parent 990fdd2
commit 807575f
Show file tree

Hide file tree

Showing 97 changed files with 206 additions and 233 deletions.
diff --git a/browser/base/content/test/general/browser.toml b/browser/base/content/test/general/browser.toml
@@ -355,7 +355,6 @@ skip-if = ["os == 'linux' && fission && tsan"] # high frequency intermittent
 
 ["browser_newWindowDrop.js"]
 https_first_disabled = true
-skip-if = ["os == 'win' && os_version == '6.1'"] # bug 1715862
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 
 ["browser_new_http_window_opened_from_file_tab.js"]
@@ -388,7 +387,7 @@ https_first_disabled = true
 skip-if = [
   "os == 'mac'",
   "os == 'linux' && !debug",
-  "os == 'win' && bits == 32",
+  "win11_2009 && bits == 32",
 ] # Bug 1559410 for all instances
 support-files = [
   "refresh_header.sjs",
@@ -463,15 +462,14 @@ https_first_disabled = true
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 
 ["browser_tab_drag_drop_perwindow.js"]
-skip-if = ["os == 'win' && os_version == '6.1' && bits == 32"] # bug 1717587
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 
 ["browser_tab_dragdrop.js"]
 skip-if = ["true"] # Bug 1312436, Bug 1388973
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 
 ["browser_tab_dragdrop2.js"]
-skip-if = ["os == 'win' && bits == 32 && !debug"] # high frequency win7 intermittent: crash
+skip-if = ["win11_2009 && bits == 32 && !debug"] # high frequency win7 intermittent: crash
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 
 ["browser_tabfocus.js"]

diff --git a/browser/base/content/test/performance/browser.toml b/browser/base/content/test/performance/browser.toml
@@ -88,7 +88,7 @@ skip-if = [
 ["browser_tabstrip_overflow_underflow.js"]
 skip-if = [
   "os == 'win' && verify && !debug",
-  "os == 'win' && bits == 32",
+  "win11_2009 && bits == 32",
 ]
 
 ["browser_tabswitch.js"]
@@ -97,13 +97,13 @@ skip-if = ["os == 'win'"] #Bug 1455054
 ["browser_toolbariconcolor_restyles.js"]
 
 ["browser_urlbar_keyed_search.js"]
-skip-if = ["os == 'win' && bits == 32"] # # Disabled on Win32 because of intermittent OOM failures (bug 1448241)
+skip-if = ["win11_2009 && bits == 32"] # # Disabled on Win32 because of intermittent OOM failures (bug 1448241)
 
 ["browser_urlbar_search.js"]
 skip-if = [
   "os == 'linux' && (debug || ccov)", # Disabled on Linux debug and ccov due to intermittent timeouts. Bug 1414126.
   "os == 'win' && (debug || ccov)", # Disabled on Windows debug and ccov due to intermittent timeouts. bug 1426611.
-  "os == 'win' && bits == 32",
+  "win11_2009 && bits == 32",
 ]
 
 ["browser_vsync_accessibility.js"]

diff --git a/browser/base/content/test/performance/io/browser.toml b/browser/base/content/test/performance/io/browser.toml
@@ -31,7 +31,7 @@ environment = [
 skip-if = [
   "apple_silicon", # bug 1707724
   "socketprocess_networking",
-  "os == 'win' && bits == 32",
+  "win11_2009 && bits == 32",
   "os == 'win' && msix", # Bug 1833639
 ]
 

diff --git a/browser/base/content/test/plugins/browser.toml b/browser/base/content/test/plugins/browser.toml
@@ -8,9 +8,8 @@ support-files = [
 ["browser_bug797677.js"]
 
 ["browser_enable_DRM_prompt.js"]
-skip-if = ["(os == 'win' && processor == 'aarch64')"] # bug 1533164
 
 ["browser_globalplugin_crashinfobar.js"]
-skip-if = ["!crashreporter"]
+run-if = ["crashreporter"]
 
 ["browser_private_browsing_eme_persistent_state.js"]
diff --git a/browser/base/content/test/popupNotifications/browser.toml b/browser/base/content/test/popupNotifications/browser.toml
@@ -2,63 +2,97 @@
 support-files = ["head.js"]
 
 ["browser_displayURI.js"]
-skip-if = ["(os == 'linux' && (debug || asan))"]
+skip-if = [
+  "os == 'linux' && debug",
+  "os == 'linux' && asan",
+]
 
 ["browser_popupNotification.js"]
-skip-if = ["(os == 'linux' && (debug || asan))"]
+skip-if = [
+  "os == 'linux' && debug",
+  "os == 'linux' && asan",
+]
 
 ["browser_popupNotification_2.js"]
 https_first_disabled = true
 skip-if = [
-  "os == 'linux' && (debug || asan)", # bug 1251135
+  "os == 'linux' && debug", # bug 1251135
+  "os == 'linux' && asan", # bug 1251135
   "os == 'linux' && bits == 64 && os_version == '18.04'", # bug 1251135
 ]
 
 ["browser_popupNotification_3.js"]
 https_first_disabled = true
 skip-if = [
-  "os == 'linux' && (debug || asan)",
+  "os == 'linux' && debug",
+  "os == 'linux' && asan",
   "verify",
 ]
 
 ["browser_popupNotification_4.js"]
-skip-if = ["(os == 'linux' && (debug || asan))"]
+skip-if = [
+  "os == 'linux' && debug",
+  "os == 'linux' && asan",
+]
 
 ["browser_popupNotification_5.js"]
 skip-if = ["true"] # bug 1332646
 
 ["browser_popupNotification_accesskey.js"]
 skip-if = [
-  "(os == 'linux' && (debug || asan))",
+  "os == 'linux' && debug",
+  "os == 'linux' && asan",
   "os == 'mac'",
 ]
 
 ["browser_popupNotification_checkbox.js"]
 skip-if = [
-  "(os == 'linux' && (debug || asan))",
+  "os == 'linux' && debug",
+  "os == 'linux' && asan",
   "a11y_checks", # Bug 1858037 to investigate intermittent a11y_checks results (fails on Try, passes on Autoland)
 ]
 
 ["browser_popupNotification_hide_after_identity_panel.js"]
-skip-if = ["(os == 'linux' && (debug || asan))"]
+skip-if = [
+  "os == 'linux' && debug",
+  "os == 'linux' && asan",
+]
 
 ["browser_popupNotification_hide_after_protections_panel.js"]
-skip-if = ["(os == 'linux' && (debug || asan))"]
+skip-if = [
+  "os == 'linux' && debug",
+  "os == 'linux' && asan",
+]
 
 ["browser_popupNotification_keyboard.js"]
-skip-if = ["(os == 'linux' && (debug || asan))"]
+skip-if = [
+  "os == 'linux' && debug",
+  "os == 'linux' && asan",
+]
 
 ["browser_popupNotification_learnmore.js"]
-skip-if = ["(os == 'linux' && (debug || asan))"]
+skip-if = [
+  "os == 'linux' && debug",
+  "os == 'linux' && asan",
+]
 
 ["browser_popupNotification_no_anchors.js"]
 https_first_disabled = true
-skip-if = ["(os == 'linux' && (debug || asan))"]
+skip-if = [
+  "os == 'linux' && debug",
+  "os == 'linux' && asan",
+]
 
 ["browser_popupNotification_security_delay.js"]
 
 ["browser_popupNotification_selection_required.js"]
-skip-if = ["(os == 'linux' && (debug || asan))"]
+skip-if = [
+  "os == 'linux' && debug",
+  "os == 'linux' && asan",
+]
 
 ["browser_reshow_in_background.js"]
-skip-if = ["(os == 'linux' && (debug || asan))"]
+skip-if = [
+  "os == 'linux' && debug",
+  "os == 'linux' && asan",
+]
diff --git a/browser/base/content/test/popups/browser.toml b/browser/base/content/test/popups/browser.toml
@@ -14,7 +14,7 @@ support-files = [
   "popup_blocker_10_popups.html",
 ]
 skip-if = [
-  "(os == 'linux')", # Frequent bug 1081925 and bug 1125520 failures
+  "os == 'linux'", # Frequent bug 1081925 and bug 1125520 failures
   "debug",
 ]
 

diff --git a/browser/base/content/test/tabdialogs/browser.toml b/browser/base/content/test/tabdialogs/browser.toml
@@ -10,7 +10,6 @@ support-files = ["loadDelayedReply.sjs"]
 skip-if = [
   "apple_silicon && !debug", # Bug 1786514
   "apple_catalina && !debug", # Bug 1786514
-  "win10_2004 && !debug", # Bug 1786514
 ]
 support-files = ["test_page.html"]
 

diff --git a/browser/base/content/test/tabs/browser.toml b/browser/base/content/test/tabs/browser.toml
@@ -238,7 +238,6 @@ support-files = [
 ["browser_overflowScroll.js"]
 fail-if = ["a11y_checks"] # Bug 1854233 scrollbutton-down/up may not be focusable and/or labeled
 skip-if = [
-  "win10_2004", # Bug 1775648
   "win11_2009", # Bug 1797751
 ]
 

diff --git a/browser/components/about/test/unit/xpcshell.toml b/browser/components/about/test/unit/xpcshell.toml
@@ -1,6 +1,6 @@
 [DEFAULT]
-skip-if = ["toolkit == 'android'"] # bug 1730213
-head =  '' # no value from INI
+skip-if = ["os == 'android'"] # bug 1730213
+head =  ''
 # make the firefox services (eg newtab-service) available to xpcshell
 firefox-appdir = "browser"
 

diff --git a/browser/components/aboutlogins/tests/browser/browser.toml b/browser/components/aboutlogins/tests/browser/browser.toml
@@ -19,14 +19,13 @@ skip-if = [
 ]
 
 ["browser_alertDismissedAfterChangingPassword.js"]
-skip-if = ["os == 'mac' && os_version == '10.15' && !debug"] # Bug 1684513
+skip-if = ["apple_catalina && !debug"] # Bug 1684513
 
 ["browser_breachAlertShowingForAddedLogin.js"]
 
 ["browser_confirmDeleteDialog.js"]
 
 ["browser_contextmenuFillLogins.js"]
-skip-if = ["win10_2004 && debug"] # Bug 1723573
 
 ["browser_copyToClipboardButton.js"]
 

diff --git a/browser/components/aboutlogins/tests/unit/xpcshell.toml b/browser/components/aboutlogins/tests/unit/xpcshell.toml
@@ -1,5 +1,5 @@
 [DEFAULT]
-skip-if = ["toolkit == 'android'"] # bug 1730213
+skip-if = ["os == 'android'"] # bug 1730213
 head = "head.js"
 firefox-appdir = "browser"
 

diff --git a/browser/components/attribution/test/browser/browser.toml b/browser/components/attribution/test/browser/browser.toml
@@ -2,9 +2,9 @@
 support-files = ["head.js"]
 
 ["browser_AttributionCode_Mac_telemetry.js"]
-skip-if = ["toolkit != 'cocoa'"] # macOS only telemetry.
+run-if = ["os == 'mac'"] # macOS only telemetry.
 
 ["browser_AttributionCode_telemetry.js"]
 # These tests only cover the attribution cache file - which only exists on
 # Windows.
-skip-if = ["os != 'win'"]
+run-if = ["os == 'win'"]
diff --git a/browser/components/contextualidentity/test/browser/browser.toml b/browser/components/contextualidentity/test/browser/browser.toml
@@ -24,7 +24,6 @@ skip-if = ["os == 'linux' && bits == 64 && !debug"] # Bug 1731442
 ["browser_favicon.js"]
 
 ["browser_forgetAPI_EME_forgetThisSite.js"]
-skip-if = ["os == 'win' && processor == 'aarch64'"] # bug 1531927
 
 ["browser_forgetAPI_cookie_getCookiesWithOriginAttributes.js"]
 
@@ -45,7 +44,6 @@ skip-if = [
   "verify && debug && os == 'linux'",
   "apple_silicon", # Disabled due to bleedover with other tests when run in regular suites; passes in "failures" jobs
   "os == 'linux' && socketprocess_networking",
-  "win10_2004 && !debug",
 ]
 
 ["browser_newtabButton.js"]

diff --git a/browser/components/customizableui/test/unit/xpcshell.toml b/browser/components/customizableui/test/unit/xpcshell.toml
@@ -1,6 +1,6 @@
 [DEFAULT]
-head =  '' # no value from INI
-skip-if = ["toolkit == 'android'"] # bug 1730213
+head =  ''
+skip-if = ["os == 'android'"] # bug 1730213
 firefox-appdir = "browser"
 
 ["test_unified_extensions_migration.js"]
diff --git a/browser/components/doh/test/browser/browser.toml b/browser/components/doh/test/browser/browser.toml
@@ -15,10 +15,10 @@ skip-if = ["socketprocess_networking"]
 ["browser_providerSteering.js"]
 
 ["browser_remoteSettings_newProfile.js"]
-skip-if = ["os == 'win' && bits == 32"] # Bug 1713464
+skip-if = ["win11_2009 && bits == 32"] # Bug 1713464
 
 ["browser_remoteSettings_rollout.js"]
-skip-if = ["os == 'win' && bits == 32"] # Bug 1713464
+skip-if = ["win11_2009 && bits == 32"] # Bug 1713464
 
 ["browser_rollback.js"]
 

diff --git a/browser/components/doh/test/unit/xpcshell.toml b/browser/components/doh/test/unit/xpcshell.toml
@@ -1,5 +1,5 @@
 [DEFAULT]
-skip-if = ["toolkit == 'android'"] # bug 1730213
+skip-if = ["os == 'android'"] # bug 1730213
 head = "head.js"
 firefox-appdir = "browser"
 support-files = ["../../../../../netwerk/test/unit/http2-ca.pem"]

diff --git a/browser/components/downloads/test/browser/browser.toml b/browser/components/downloads/test/browser/browser.toml
@@ -43,8 +43,7 @@ support-files = ["test_spammy_page.html"]
 
 ["browser_downloads_panel_context_menu.js"]
 skip-if = [
-  "os == 'win' && os_version == '10.0' && bits == 64 && !debug", # Bug 1719949
-  "win10_2004 && bits == 32 && debug", # Bug 1727925
+  "win10_2009 && bits == 64 && !debug", # Bug 1719949
 ]
 
 ["browser_downloads_panel_ctrl_click.js"]

diff --git a/browser/components/downloads/test/unit/xpcshell.toml b/browser/components/downloads/test/unit/xpcshell.toml
@@ -1,7 +1,7 @@
 [DEFAULT]
 head = "head.js"
 firefox-appdir = "browser"
-skip-if = ["toolkit == 'android'"] # bug 1730213
+skip-if = ["os == 'android'"] # bug 1730213
 
 ["test_DownloadLastDir_basics.js"]
 

diff --git a/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.toml b/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.toml
@@ -1,5 +1,5 @@
 [DEFAULT]
-skip-if = ["toolkit == 'android'"] # bug 1730213
+skip-if = ["os == 'android'"] # bug 1730213
 firefox-appdir = "browser"
 head = "head.js"
 support-files = ["policytest_v0.1.xpi"]

diff --git a/browser/components/extensions/test/browser/browser.toml b/browser/components/extensions/test/browser/browser.toml
@@ -245,7 +245,6 @@ skip-if = [
 ["browser_ext_incognito_views.js"]
 skip-if = [
   "apple_silicon && !fission", # Disabled due to bleedover with other tests when run in regular suites; passes in "failures" jobs
-  "win10_2004 && bits == 32 && debug", # Bug 1727925
 ]
 
 ["browser_ext_lastError.js"]
@@ -374,7 +373,7 @@ skip-if = ["os == 'linux' && swgl && fission && tsan"] # high frequency intermit
 
 ["browser_ext_port_disconnect_on_crash.js"]
 https_first_disabled = true
-skip-if = ["!crashreporter"]
+run-if = ["crashreporter"]
 
 ["browser_ext_port_disconnect_on_window_close.js"]
 
@@ -484,7 +483,6 @@ https_first_disabled = true
 https_first_disabled = true
 skip-if = [
   "os == 'mac'", # Bug 1722607
-  "win10_2004 && debug", # high frequency intermittent Bug 1722607
   "os == 'linux' && debug", #Bug 1722607
 ]
 
@@ -607,8 +605,6 @@ https_first_disabled = true
 ["browser_ext_url_overrides_newtab.js"]
 skip-if = [
   "os == 'linux' && os_version == '18.04'", # Bug 1651261
-  "win10_2004 && asan", # Bug 1723573
-  "win10_2004 && debug", # Bug 1723573
   "win11_2009 && asan", # Bug 1797751
   "win11_2009 && debug", # Bug 1797751
 ]