Bug 1959265 - clean and sanitize browser/**/xpcshell.toml files. r=aryx,credential-management-reviewers,search-reviewers,sessionstore-reviewers,places-reviewers,omc-reviewers,migration-reviewers,backup-reviewers,home-newtab-reviewers,urlbar-reviewers,firefox-ai-ml-reviewers,profiles-reviewers,willdurand,tarek,dimi,jteow,sthompson,mconley,pdahiya,mossop

Differential Revision: https://phabricator.services.mozilla.com/D244829

browser/components/about/test/unit/xpcshell.toml

@@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = ["os == 'android'"] # bug 1730213
 head =  ''
 # make the firefox services (eg newtab-service) available to xpcshell
 firefox-appdir = "browser"

browser/components/aboutlogins/tests/unit/xpcshell.toml

@@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = ["os == 'android'"] # bug 1730213
 head = "head.js"
 firefox-appdir = "browser"
 

browser/components/aboutwelcome/tests/xpcshell/xpcshell.toml

@@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = ["os == 'android'"]
 firefox-appdir = "browser"
 
 ["test_AboutWelcomeAttribution.js"]

browser/components/backup/tests/xpcshell/xpcshell.toml

@@ -1,7 +1,6 @@
 [DEFAULT]
 head = "head.js"
 firefox-appdir = "browser"
-skip-if = ["os == 'android'"]
 prefs = [
   "browser.backup.log=true",
 ]

browser/components/customizableui/test/unit/xpcshell.toml

@@ -1,6 +1,5 @@
 [DEFAULT]
 head =  ''
-skip-if = ["os == 'android'"] # bug 1730213
 firefox-appdir = "browser"
 
 ["test_unified_extensions_migration.js"]

browser/components/doh/test/unit/xpcshell.toml

@@ -1,11 +1,9 @@
 [DEFAULT]
-skip-if = ["os == 'android'"] # bug 1730213
 head = "head.js"
 firefox-appdir = "browser"
 support-files = ["../../../../../netwerk/test/unit/http2-ca.pem"]
 
 ["test_DNSLookup.js"]
-skip-if = ["debug"] # Bug 1617845
 
 ["test_LookupAggregator.js"]
 

browser/components/downloads/test/unit/xpcshell.toml

@@ -1,7 +1,6 @@
 [DEFAULT]
 head = "head.js"
 firefox-appdir = "browser"
-skip-if = ["os == 'android'"] # bug 1730213
 
 ["test_DownloadLastDir_basics.js"]
 

browser/components/enterprisepolicies/tests/xpcshell/xpcshell.toml

@@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = ["os == 'android'"] # bug 1730213
 firefox-appdir = "browser"
 head = "head.js"
 support-files = [

browser/components/extensions/test/xpcshell/xpcshell.toml

@@ -1,17 +1,14 @@
 [DEFAULT]
-skip-if = ["os == 'android'"] # bug 1730213
 head = "head.js"
 firefox-appdir = "browser"
 tags = "webextensions"
 dupe-manifest = ""
 
 ["test_ext_bookmarks.js"]
-skip-if = ["condprof"] # Bug 1769184 - by design for now
 
 ["test_ext_browsingData_downloads.js"]
 
 ["test_ext_browsingData_passwords.js"]
-skip-if = ["tsan"] # Times out, bug 1612707
 
 ["test_ext_browsingData_settings.js"]
 
@@ -44,7 +41,6 @@ skip-if = ["tsan"] # Times out, bug 1612707
 ["test_ext_pkcs11_management.js"]
 
 ["test_ext_settings_overrides_defaults.js"]
-skip-if = ["condprof"] # Bug 1776135 - by design, modifies search settings at start of test
 
 ["test_ext_settings_overrides_search.js"]
 
@@ -53,7 +49,6 @@ skip-if = ["condprof"] # Bug 1776135 - by design, modifies search settings at st
 ["test_ext_settings_validate.js"]
 
 ["test_ext_topSites.js"]
-skip-if = ["condprof"] # Bug 1769184 - by design for now
 
 ["test_ext_url_overrides_newtab.js"]
 

browser/components/installerprefs/test/unit/xpcshell.toml

@@ -1,7 +1,7 @@
 [DEFAULT]
 head = "head.js"
 firefox-appdir = "browser"
-skip-if = ["os != 'win'"]
+run-if = ["os == 'win'"]
 
 # These tests must all run sequentially because they use the same registry key.
 # It might be possible to get around this requirement by overriding the install
@@ -10,7 +10,9 @@ skip-if = ["os != 'win'"]
 
 ["test_empty_prefs_list.js"]
 run-sequentially = "Uses the Windows registry"
-skip-if = ["os == 'win' && msix"] # https://bugzilla.mozilla.org/show_bug.cgi?id=1807932
+skip-if = [
+  "os == 'win' && os_version == '11.26100' && processor == 'x86_64' && msix", # Bug 1807932
+]
 
 ["test_invalid_name.js"]
 run-sequentially = "Uses the Windows registry"

browser/components/migration/tests/unit/xpcshell.toml

@@ -2,7 +2,6 @@
 head = "head_migration.js"
 tags = "condprof os_integration"
 firefox-appdir = "browser"
-skip-if = ["os == 'android'"] # bug 1730213
 prefs = ["browser.migrate.showBookmarksToolbarAfterMigration=true"]
 support-files = [
   "Library/**",
@@ -32,33 +31,21 @@ run-if = ["os == 'linux'"]
 ["test_Chrome_corrupt_history.js"]
 
 ["test_Chrome_credit_cards.js"]
-skip-if = [
+skip-if = ["os == 'linux' && os_version == '18.04' && processor == 'x86_64'"]
-  "os == 'linux'",
-  "os == 'android'",
-  "condprof", # bug 1769154 - not realistic for condprof
-]
 
 ["test_Chrome_extensions.js"]
 
 ["test_Chrome_formdata.js"]
 
 ["test_Chrome_history.js"]
-skip-if = ["os != 'mac'"] # Relies on ULibDir
+run-if = ["os == 'mac'"] # Relies on ULibDir
 
 ["test_Chrome_passwords.js"]
-skip-if = [
+skip-if = ["os == 'linux' && os_version == '18.04' && processor == 'x86_64'"]
-  "os == 'linux'",
-  "os == 'android'",
-  "condprof", # bug 1769154 - not realistic for condprof
-]
 
 ["test_Chrome_passwords_emptySource.js"]
-skip-if = [
-  "os == 'linux'",
-  "os == 'android'",
-  "condprof", # bug 1769154 - not realistic for condprof
-]
 support-files = ["LibraryWithNoData/**"]
+skip-if = ["os == 'linux' && os_version == '18.04' && processor == 'x86_64'"]
 
 ["test_Chrome_permissions.js"]
 
@@ -73,10 +60,11 @@ run-if = ["os == 'win' && bits == 64"] # bug 1392396
 
 ["test_IE_history.js"]
 run-if = ["os == 'win'"]
-skip-if = ["os == 'win' && msix"] # https://bugzilla.mozilla.org/show_bug.cgi?id=1807928
+skip-if = [
+  "os == 'win' && os_version == '11.26100' && processor == 'x86_64' && msix", # Bug 1807928
+]
 
 ["test_MigrationUtils_timedRetry.js"]
-skip-if = ["os == 'mac' && !debug"] #Bug 1558330
 
 ["test_PasswordFileMigrator.js"]
 

browser/components/newtab/test/xpcshell/xpcshell.toml

@@ -1,6 +1,5 @@
 [DEFAULT]
 firefox-appdir = "browser"
-skip-if = ["os == 'android'"] # bug 1730213
 head = "../../../../extensions/newtab/test/xpcshell/head.js"
 
 ["test_AboutNewTab.js"]

browser/components/pagedata/tests/unit/xpcshell.toml

@@ -1,6 +1,5 @@
 [DEFAULT]
 firefox-appdir = "browser"
-skip-if = ["os == 'android'"] # bug 1730213
 support-files = ["head.js"]
 head = "head.js"
 

browser/components/places/tests/unit/xpcshell.toml

@@ -1,7 +1,6 @@
 [DEFAULT]
 head = "head_bookmarks.js"
 firefox-appdir = "browser"
-skip-if = ["os == 'android'"] # bug 1730213
 support-files = [
   "bookmarks.glue.html",
   "bookmarks.glue.json",

browser/components/profiles/tests/unit/xpcshell.toml

@@ -17,5 +17,9 @@ prefs = [
 ["test_selectable_profile_service_exists.js"]
 
 ["test_selectable_profiles_lifecycle.js"]
+skip-if = [
+  "os == 'mac' && os_version == '10.15' && processor == 'x86_64'", # Bug 1952514
+  "os == 'mac' && os_version == '14.70' && processor == 'x86_64'", # Bug 1952514
+]
 
 ["test_shared_prefs_lifecycles_methods.js"]

browser/components/search/test/unit/xpcshell.toml

@@ -3,7 +3,6 @@ support-files = [
   "../../../../../services/settings/dumps/main/search-config-v2.json",
 ]
 prefs = ["browser.search.log=true"]
-skip-if = ["os == 'android'"] # bug 1730213
 firefox-appdir = "browser"
 
 ["test_domain_to_categories_store.js"]

browser/components/sessionstore/test/unit/xpcshell.toml

@@ -2,7 +2,6 @@
 head = "head.js"
 tags = "condprof"
 firefox-appdir = "browser"
-skip-if = ["os == 'android'"] # bug 1730213
 support-files = [
   "data/sessionCheckpoints_all.json",
   "data/sessionstore_invalid.js",
@@ -10,19 +9,31 @@ support-files = [
 ]
 
 ["test_backup_once.js"]
-skip-if = ["condprof"]  # 1769154
+skip-if = [
+  "os == 'linux' && os_version == '18.04' && processor == 'x86_64' && opt && condprof", # Bug 1769154
+  "os == 'win' && os_version == '11.26100' && processor == 'x86_64' && opt && condprof", # Bug 1769154
+]
 
 ["test_final_write_cleanup.js"]
 
 ["test_histogram_corrupt_files.js"]
 
 ["test_migration_lz4compression.js"]
-skip-if = ["condprof"]  # 1769154
+skip-if = [
+  "os == 'linux' && os_version == '18.04' && processor == 'x86_64' && opt && condprof", # Bug 1769154
+  "os == 'win' && os_version == '11.26100' && processor == 'x86_64' && opt && condprof", # Bug 1769154
+]
 
 ["test_startup_invalid_session.js"]
-skip-if = ["condprof"]  # 1769154
+skip-if = [
+  "os == 'linux' && os_version == '18.04' && processor == 'x86_64' && opt && condprof", # Bug 1769154
+  "os == 'win' && os_version == '11.26100' && processor == 'x86_64' && opt && condprof", # Bug 1769154
+]
 
 ["test_startup_nosession_async.js"]
-skip-if = ["condprof"]  # 1769154
+skip-if = [
+  "os == 'linux' && os_version == '18.04' && processor == 'x86_64' && opt && condprof", # Bug 1769154
+  "os == 'win' && os_version == '11.26100' && processor == 'x86_64' && opt && condprof", # Bug 1769154
+]
 
 ["test_startup_session_async.js"]

browser/components/shell/test/unit/xpcshell.toml

@@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = ["os == 'android'"] # bug 1730213
 firefox-appdir = "browser"
 tags = "os_integration"
 

browser/components/syncedtabs/test/xpcshell/xpcshell.toml

@@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = ["os == 'android'"] # bug 1730213
 head = "head.js"
 firefox-appdir = "browser"
 

browser/components/tests/unit/xpcshell.toml

@@ -1,7 +1,6 @@
 [DEFAULT]
 head = "head.js"
 firefox-appdir = "browser"
-skip-if = ["os == 'android'"] # bug 1730213
 support-files = ["distribution.ini"]
 
 ["test_browserGlue_migration_ctrltab_recently_used_order.js"]
@@ -11,7 +10,7 @@ support-files = ["distribution.ini"]
 ["test_browserGlue_migration_no_errors.js"]
 
 ["test_browserGlue_migration_osauth.js"]
-skip-if = ["nightly_build", "os == 'linux'"]
+skip-if = ["nightly_build"]
 
 ["test_browserGlue_migration_places_xulstore.js"]
 

browser/components/urlbar/tests/quicksuggest/unit/xpcshell.toml

@@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = ["os == 'android'"] # bug 1730213
 head = "../../unit/head.js head.js"
 firefox-appdir = "browser"
 

browser/components/urlbar/tests/unit/xpcshell.toml

@@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = ["os == 'android'"] # bug 1730213
 head = "head.js"
 firefox-appdir = "browser"
 support-files = ["data/engine.xml"]
@@ -97,7 +96,6 @@ prefs = [
 ["test_history_bookmark_results_on_search_service_failure.js"]
 
 ["test_keywords.js"]
-skip-if = ["os == 'linux'"] # bug 1474616
 
 ["test_l10nCache.js"]
 

browser/extensions/formautofill/test/unit/xpcshell.toml

@@ -1,8 +1,4 @@
 [DEFAULT]
-skip-if = [
-  "os == 'linux' && ccov", # bug 1821945
-  "os == 'android'", # bug 1730213
-]
 firefox-appdir = "browser"
 head = "head.js"
 support-files = ["../fixtures/**"]
@@ -43,13 +39,8 @@ head = "head_addressComponent.js"
 ["test_addressDataLoader.js"]
 
 ["test_addressRecords.js"]
-skip-if = ["os == 'mac' && os_version == '11.20' && arch == 'aarch64'"] # bug 1729554
 
 ["test_autofillFormFields.js"]
-skip-if = [
-  "tsan", # Times out, bug 1612707
-  "os == 'mac' && os_version == '11.20' && arch == 'aarch64'", # bug 1729554
-]
 
 ["test_autofill_ios_library.js"]
 
@@ -57,8 +48,7 @@ skip-if = [
 
 ["test_creditCardRecords.js"]
 skip-if = [
-  "tsan", # Times out, bug 1612707
+  "os == 'mac' && os_version == '11.20' && arch == 'aarch64'", # Bug 1729554
-  "os == 'mac' && os_version == '11.20' && arch == 'aarch64'", # bug 1729554
 ]
 
 ["test_extractLabelStrings.js"]
@@ -77,8 +67,7 @@ skip-if = [
 
 ["test_getRecords.js"]
 skip-if = [
-  "tsan", # Times out, bug 1612707
+  "os == 'mac' && os_version == '11.20' && arch == 'aarch64'", # Bug 1729554
-  "os == 'mac' && os_version == '11.20' && arch == 'aarch64'", # bug 1729554
 ]
 
 ["test_inspectFields.js"]
@@ -94,7 +83,6 @@ skip-if = [
 ["test_known_strings.js"]
 
 ["test_migrateRecords.js"]
-skip-if = ["tsan"] # Times out, bug 1612707
 
 ["test_nameUtils.js"]
 
@@ -108,29 +96,25 @@ skip-if = ["tsan"] # Times out, bug 1612707
 
 ["test_reconcile.js"]
 skip-if = [
-  "tsan", # Times out, bug 1612707
+  "os == 'mac' && os_version == '11.20' && arch == 'aarch64'", # Bug 1729554
-  "os == 'mac' && os_version == '11.20' && arch == 'aarch64'", # bug 1729554
 ]
 
 ["test_savedFieldNames.js"]
 
 ["test_storage_remove.js"]
 skip-if = [
-  "tsan", # Times out, bug 1612707
+  "os == 'mac' && os_version == '11.20' && arch == 'aarch64'", # Bug 1729554
-  "os == 'mac' && os_version == '11.20' && arch == 'aarch64'", # bug 1729554
 ]
 
 ["test_storage_syncfields.js"]
 
 ["test_storage_tombstones.js"]
 skip-if = [
-  "tsan", # Times out, bug 1612707
+  "os == 'mac' && os_version == '11.20' && arch == 'aarch64'", # Bug 1729554
-  "os == 'mac' && os_version == '11.20' && arch == 'aarch64'", # bug 1729554
 ]
 
 ["test_sync.js"]
 head = "head.js ../../../../../services/sync/tests/unit/head_appinfo.js ../../../../../services/common/tests/unit/head_helpers.js ../../../../../services/sync/tests/unit/head_helpers.js ../../../../../services/sync/tests/unit/head_http_server.js"
-skip-if = ["tsan"] # Times out, bug 1612707
 
 ["test_sync_deprecate_address_x_name_fields.js"]
 head = "head.js ../../../../../services/sync/tests/unit/head_appinfo.js ../../../../../services/common/tests/unit/head_helpers.js ../../../../../services/sync/tests/unit/head_helpers.js ../../../../../services/sync/tests/unit/head_http_server.js"
@@ -138,14 +122,12 @@ head = "head.js ../../../../../services/sync/tests/unit/head_appinfo.js ../../..
 ["test_sync_deprecate_credit_card_v4.js"]
 head = "head.js ../../../../../services/sync/tests/unit/head_appinfo.js ../../../../../services/common/tests/unit/head_helpers.js ../../../../../services/sync/tests/unit/head_helpers.js ../../../../../services/sync/tests/unit/head_http_server.js"
 skip-if = [
-  "tsan", # Times out, bug 1612707
+  "os == 'mac' && os_version == '11.20' && arch == 'aarch64'", # Bug 1729554
-  "os == 'mac' && os_version == '11.20' && arch == 'aarch64'", # bug 1729554
 ]
 
 ["test_toOneLineAddress.js"]
 
 ["test_transformFields.js"]
 skip-if = [
-  "tsan", # Times out, bug 1612707
+  "os == 'mac' && os_version == '11.20' && arch == 'aarch64'", # Bug 1729554
-  "os == 'mac' && os_version == '11.20' && arch == 'aarch64'", # bug 1729554
 ]

browser/extensions/newtab/test/xpcshell/xpcshell.toml

@@ -1,7 +1,6 @@
 [DEFAULT]
 firefox-appdir = "browser"
 head = "head.js"
-skip-if = ["os == 'android'"] # bug 1730213
 prefs = [
   "browser.startup.homepage.abouthome_cache.enabled=true",
   "browser.startup.homepage.abouthome_cache.testing=true",
@@ -11,7 +10,6 @@ prefs = [
 
 ["test_AboutHomeStartupCacheWorker.js"]
 support-files = ["topstories.json"]
-skip-if = ["socketprocess_networking"] # Bug 1759035
 
 ["test_AdsFeed.js"]
 

browser/modules/test/unit/xpcshell.toml

@@ -1,7 +1,6 @@
 [DEFAULT]
 head =  ''
 firefox-appdir = "browser"
-skip-if = ["os == 'android'"] # bug 1730213
 tags = "os_integration"
 
 ["test_Dedupe.js"]

browser/tools/mozscreenshots/tests/xpcshell/xpcshell.toml

@@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = ["os == 'android'"] # bug 1730213
 support-files = ["../../mozscreenshots/extension/TestRunner.sys.mjs"]
 
 ["test_testConfigurations.js"]