commit ea144b09617862b9dc4b9dcb43efddb85eba5f13 parent c06f392aef6ac5cc44e2e1c541c2f755612307e0 Author: Florian Quèze <florian@queze.net> Date: Tue, 21 Oct 2025 08:42:46 +0000 Bug 1995058 - set requesttimeoutfactor annotations for xpcshell tests that exceed the new 30s default timeout, r=jmaher,necko-reviewers,extension-reviewers,dom-storage-reviewers,migration-reviewers,toolkit-telemetry-reviewers,sthompson,janv,valentin,robwu,janerik. Differential Revision: https://phabricator.services.mozilla.com/D269184 Diffstat:
28 files changed, 70 insertions(+), 0 deletions(-)
diff --git a/browser/components/backup/tests/xpcshell/xpcshell.toml b/browser/components/backup/tests/xpcshell/xpcshell.toml @@ -26,6 +26,7 @@ support-files = [ ] ["test_BackupService_archive.js"] +requesttimeoutfactor = 2 # Slow on macOS debug support-files = [ "data/corrupt.zip", "data/break_over_unicode.html", diff --git a/browser/components/extensions/test/xpcshell/xpcshell.toml b/browser/components/extensions/test/xpcshell/xpcshell.toml @@ -34,6 +34,7 @@ dupe-manifest = "" ["test_ext_menu_caller.js"] ["test_ext_menu_startup.js"] +requesttimeoutfactor = 2 # Slow on Linux debug ["test_ext_normandyAddonStudy.js"] diff --git a/browser/components/migration/tests/unit/xpcshell.toml b/browser/components/migration/tests/unit/xpcshell.toml @@ -71,6 +71,7 @@ run-if = ["os == 'win'"] run-if = ["os == 'win' && bits == 64"] # bug 1392396 ["test_IE_history.js"] +requesttimeoutfactor = 2 # Slow on condprof run-if = ["os == 'win'"] skip-if = [ "os == 'win' && os_version == '11.26100' && processor == 'x86_64' && msix", # Bug 1807928 diff --git a/browser/components/urlbar/tests/quicksuggest/unit/xpcshell.toml b/browser/components/urlbar/tests/quicksuggest/unit/xpcshell.toml @@ -10,8 +10,10 @@ prefs = [ ["test_merinoClient.js"] ["test_merinoClient_sessions.js"] +requesttimeoutfactor = 2 # Slow on Windows ["test_quicksuggest.js"] +requesttimeoutfactor = 2 # Slow on Linux ["test_quicksuggest_addons.js"] @@ -45,6 +47,7 @@ skip-if = ["true"] # Bug 1880214 ["test_quicksuggest_migrate_v3.js"] ["test_quicksuggest_offlineDefault.js"] +requesttimeoutfactor = 2 # Slow on Linux and Windows ["test_quicksuggest_relevanceRanking.js"] @@ -55,6 +58,7 @@ skip-if = ["true"] # Bug 1880214 ["test_quicksuggest_topPicks.js"] ["test_quicksuggest_yelp.js"] +requesttimeoutfactor = 2 # Slow on Linux and Windows ["test_quicksuggest_yelp_ml.js"] diff --git a/browser/components/urlbar/tests/unit/xpcshell.toml b/browser/components/urlbar/tests/unit/xpcshell.toml @@ -135,6 +135,7 @@ skip-if = [ ["test_providerKeywords.js"] ["test_providerOmnibox.js"] +requesttimeoutfactor = 2 # Slow on Linux and Windows ["test_providerOpenTabs.js"] diff --git a/dom/fs/test/xpcshell/xpcshell.toml b/dom/fs/test/xpcshell/xpcshell.toml @@ -9,8 +9,10 @@ tags = "inc-origin-init" ["test_databaseWorkStarted.js"] ["test_fileSystemDirectoryHandle.js"] +requesttimeoutfactor = 2 # Slow on Linux ["test_fileSystemDirectoryHandle_worker.js"] +requesttimeoutfactor = 2 # Slow on Linux ["test_getDirectoryFailure.js"] diff --git a/dom/indexedDB/test/unit/xpcshell-parent-process.toml b/dom/indexedDB/test/unit/xpcshell-parent-process.toml @@ -43,6 +43,7 @@ run-if = ["false"] # Only used for recreating URLSearchParams_profile.zip ["test_cleanup_transaction.js"] ["test_clear_object_store_with_indexes.js"] +requesttimeoutfactor = 2 # Slow on Windows run-sequentially = [ "os == 'mac'", # frequent parallel fail on Mac "os == 'linux'", # frequent parallel fail on Linux @@ -115,6 +116,7 @@ skip-if = ["true"] ["test_storagePersistentUpgrade.js"] ["test_temporary_storage.js"] +requesttimeoutfactor = 2 # Slow on Linux and Windows skip-if = [ "inc_origin_init", # bug 1942783 ] diff --git a/dom/indexedDB/test/unit/xpcshell-shared.toml b/dom/indexedDB/test/unit/xpcshell-shared.toml @@ -89,6 +89,7 @@ skip-if = ["os == 'mac' && os_version == '10.15' && processor == 'x86_64' && deb ["test_key_requirements.js"] ["test_keys.js"] +requesttimeoutfactor = 2 # Slow on Linux TSan ["test_locale_aware_index_getAll.js"] diff --git a/dom/localstorage/test/unit/xpcshell.toml b/dom/localstorage/test/unit/xpcshell.toml @@ -104,6 +104,7 @@ support-files = ["migration_emptyValue_profile.zip",] ["test_slowStorageInitialization.js"] ["test_snapshotting.js"] +requesttimeoutfactor = 2 # Slow on debug ["test_stringLength.js"] prefs = ["dom.storage.enable_migration_from_unsupported_legacy_implementation=true"] diff --git a/dom/streams/test/xpcshell/xpcshell.toml b/dom/streams/test/xpcshell/xpcshell.toml @@ -14,6 +14,7 @@ prefs = ["security.allow_parent_unrestricted_js_loads=true"] ["fetch.js"] ["large-pipeto.js"] +requesttimeoutfactor = 5 # Slow on Linux and Windows run-sequentially = ["os == 'mac'"] # almost perma timeout on Mac ["proper-realm-cancel.js"] diff --git a/js/xpconnect/tests/unit/xpcshell.toml b/js/xpconnect/tests/unit/xpcshell.toml @@ -357,6 +357,7 @@ skip-if = [ ] ["test_wasm_tailcalls_profiler.js"] +requesttimeoutfactor = 3 # Slow on Windows skip-if = [ "!nightly_build", "os == 'linux' && os_version == '18.04' && processor == 'x86_64' && tsan", diff --git a/netwerk/test/unit/xpcshell.toml b/netwerk/test/unit/xpcshell.toml @@ -121,6 +121,7 @@ run-if = ["os == 'android'"] ["test_authpromptwrapper.js"] ["test_backgroundfilesaver.js"] +requesttimeoutfactor = 2 # Slow on macOS debug and Android debug ["test_be_conservative.js"] firefox-appdir = "browser" @@ -524,6 +525,7 @@ skip-if = ["os == 'win' && os_version == '11.26100' && processor == 'x86_64' && ["test_cookiejars_safebrowsing.js"] ["test_cookies_async_failure.js"] +requesttimeoutfactor = 2 # Slow on Windows run-sequentially = [ "os == 'mac'", # frequent timeouts in parallel on Mac "os == 'linux'", # frequent timeouts in parallel on Linux @@ -551,6 +553,7 @@ skip-if = [ ["test_cookies_sync_failure.js"] ["test_cookies_thirdparty.js"] +requesttimeoutfactor = 2 # Slow on macOS ["test_cookies_upgrade_10.js"] @@ -609,6 +612,7 @@ skip-if = [ ["test_domain_eviction.js"] ["test_dooh.js"] +requesttimeoutfactor = 2 # Slow on Windows head = "head_channels.js head_cache.js head_cookies.js head_trr.js head_http3.js trr_common.js" run-if = ["!socketprocess_networking"] run-sequentially = ["true"] # node server exceptions dont replay well @@ -698,6 +702,7 @@ run-sequentially = ["true"] # node server exceptions dont replay well head = "head_channels.js head_cache.js head_cookies.js head_trr.js head_http3.js http2_test_common.js" ["test_http2_proxy_concurrent_stream.js"] +requesttimeoutfactor = 4 # Slow on Linux and Windows skip-if = ["os == 'android'"] ["test_http2_with_proxy.js"] @@ -788,6 +793,7 @@ skip-if = [ ] ["test_http3_error_before_connect.js"] +requesttimeoutfactor = 3 # Slow on Linux and Windows run-sequentially = ["true"] # node server exceptions dont replay well skip-if = ["os == 'win' && os_version == '11.26100' && processor == 'x86_64' && msix"] # Bug 1807931 @@ -799,6 +805,7 @@ skip-if = [ ] ["test_http3_fast_fallback.js"] +requesttimeoutfactor = 3 # Slow on Linux run-sequentially = ["true"] # node server exceptions dont replay well skip-if = [ "os == 'win' && os_version == '10.2009' && processor == 'x86_64'", @@ -831,6 +838,7 @@ skip-if = [ ] ["test_http3_network_change.js"] +requesttimeoutfactor = 2 # Slow on Linux run-sequentially = ["true"] # node server exceptions dont replay well run-if = ["!socketprocess_networking"] skip-if = [ @@ -887,6 +895,7 @@ skip-if = [ ] ["test_http3_server_not_existing.js"] +requesttimeoutfactor = 3 # Slow on Linux run-sequentially = ["true"] # node server exceptions dont replay well ["test_http3_timings.js"] @@ -1350,6 +1359,7 @@ firefox-appdir = "browser" ["test_transparent_redirect.js"] ["test_trr.js"] +requesttimeoutfactor = 2 # Slow on Linux and Windows head = "head_channels.js head_cache.js head_cookies.js head_trr.js head_http3.js trr_common.js" ["test_trr_additional_section.js"] @@ -1391,6 +1401,7 @@ run-sequentially = ["true"] # node server exceptions dont replay well ["test_trr_flags.js"] ["test_trr_https_fallback.js"] +requesttimeoutfactor = 4 # Slow on Linux run-sequentially = ["true"] # node server exceptions dont replay well skip-if = [ "os == 'android' && os_version == '14' && processor == 'x86_64'", diff --git a/security/manager/ssl/tests/unit/xpcshell.toml b/security/manager/ssl/tests/unit/xpcshell.toml @@ -246,6 +246,7 @@ run-sequentially = ["true"] # hardcoded ports run-sequentially = ["true"] # hardcoded ports ["test_ocsp_timeout.js"] +requesttimeoutfactor = 2 # Slow on Linux and Windows run-sequentially = ["true"] # hardcoded ports ["test_ocsp_url.js"] @@ -314,6 +315,7 @@ run-if = ["!condprof"] # Bug 1769154 - as designed ["test_sss_resetState.js"] ["test_sss_sanitizeOnShutdown.js"] +requesttimeoutfactor = 3 # Slow on condprof prefs = ["privacy.sanitize.useOldClearHistoryDialog=true"] firefox-appdir = "browser" skip-if = [ @@ -322,6 +324,7 @@ skip-if = [ ] ["test_sss_sanitizeOnShutdown_v2.js"] +requesttimeoutfactor = 2 # Slow on condprof prefs = ["privacy.sanitize.useOldClearHistoryDialog=false"] firefox-appdir = "browser" skip-if = [ diff --git a/toolkit/components/antitracking/test/xpcshell/xpcshell.toml b/toolkit/components/antitracking/test/xpcshell/xpcshell.toml @@ -10,6 +10,7 @@ prefs = ["dom.security.https_first=false"] #Disable https-first because of expli skip-if = ["socketprocess_networking"] # Bug 1759035 ["test_purge_trackers.js"] +requesttimeoutfactor = 2 # Slow on Linux and Windows run-sequentially = ["os == 'mac'"] # frequent fail in parallel on Mac skip-if = [ "os == 'linux' && os_version == '18.04' && processor == 'x86_64'", # Bug 1760085 diff --git a/toolkit/components/asyncshutdown/tests/xpcshell/xpcshell.toml b/toolkit/components/asyncshutdown/tests/xpcshell/xpcshell.toml @@ -7,5 +7,6 @@ skip-if = ["os == 'android'"] ["test_AsyncShutdown_blocker_error_annotations.js"] ["test_AsyncShutdown_leave_uncaught.js"] +requesttimeoutfactor = 2 # Slow on Windows ["test_converters.js"] diff --git a/toolkit/components/backgroundtasks/tests/xpcshell/xpcshell.toml b/toolkit/components/backgroundtasks/tests/xpcshell/xpcshell.toml @@ -8,13 +8,16 @@ support-files = [ ] ["test_backgroundtask_automaticrestart.js"] +requesttimeoutfactor = 2 # Slow on Windows run-if = ["os == 'win'"] ["test_backgroundtask_deletes_profile.js"] ["test_backgroundtask_exitcodes.js"] +requesttimeoutfactor = 2 # Slow on Windows ["test_backgroundtask_experiments.js"] +requesttimeoutfactor = 6 # Slow on Linux and Windows tags = "remote-settings" run-if = ["buildapp == 'browser'"] reason = "ASRouter is Firefox-only." @@ -28,6 +31,7 @@ reason = "ASRouter is Firefox-only." ["test_backgroundtask_minruntime.js"] ["test_backgroundtask_no_output.js"] +requesttimeoutfactor = 2 # Slow on Windows skip-if = ["ccov"] reason = "Bug 1804825: code coverage harness prints [CodeCoverage] output in early startup." @@ -41,6 +45,7 @@ run-sequentially = ["true"] # Uses global profile directory `DefProfRt` ["test_backgroundtask_profile_service_configuration.js"] ["test_backgroundtask_removeDirectory.js"] +requesttimeoutfactor = 4 # Slow on Linux and Windows skip-if = ["os == 'android'"] # MultiInstanceLock doesn't work on Android ["test_backgroundtask_shouldprocessupdates.js"] @@ -57,6 +62,7 @@ reason = "ASRouter is Firefox-only." ["test_backgroundtask_unique_profile.js"] ["test_backgroundtask_update_sync_manager.js"] +requesttimeoutfactor = 2 # Slow on Windows ["test_backgroundtasksutils.js"] diff --git a/toolkit/components/cleardata/tests/unit/xpcshell.toml b/toolkit/components/cleardata/tests/unit/xpcshell.toml @@ -11,6 +11,7 @@ prefs = [ ] ["test_basic.js"] +requesttimeoutfactor = 4 # Slow on condprof ["test_bounce_tracking_protection.js"] skip-if = ["condprof"] # Bug 1893058 @@ -20,6 +21,7 @@ skip-if = ["condprof"] # Bug 1893058 ["test_clear_data_service_flags.js"] ["test_content_preferences.js"] +requesttimeoutfactor = 4 # Slow on Linux condprof ["test_cookie_banner_handling.js"] @@ -37,10 +39,12 @@ skip-if = ["condprof"] # Bug 1769154 - expected fail w/condprof ["test_permissions.js"] ["test_quota.js"] +requesttimeoutfactor = 4 # Slow on Linux condprof ["test_security_settings.js"] ["test_shutdown_exception_permission.js"] +requesttimeoutfactor = 4 # Slow on condprof ["test_storage_permission.js"] diff --git a/toolkit/components/extensions/test/xpcshell/native_messaging.toml b/toolkit/components/extensions/test/xpcshell/native_messaging.toml @@ -10,11 +10,13 @@ support-files = ["data/**"] tags = "webextensions" ["test_ext_native_messaging.js"] +requesttimeoutfactor = 2 # Slow on Windows ["test_ext_native_messaging_concurrent.js"] run-sequentially = ["os == 'mac'"] # frequent fail in parallel on Mac ["test_ext_native_messaging_perf.js"] +requesttimeoutfactor = 2 # Slow on Windows run-sequentially = [ "os == 'win'", # almost perma-fail in parallel on Windows "os == 'mac'", # frequent timeouts on Mac diff --git a/toolkit/components/extensions/test/xpcshell/xpcshell-common-e10s.toml b/toolkit/components/extensions/test/xpcshell/xpcshell-common-e10s.toml @@ -7,6 +7,7 @@ ["test_ext_webRequest_redirect_StreamFilter.js"] ["test_ext_webRequest_responseBody.js"] +requesttimeoutfactor = 2 # Slow on Linux and Android debug ["test_ext_webRequest_startup_StreamFilter.js"] diff --git a/toolkit/components/extensions/test/xpcshell/xpcshell-common.toml b/toolkit/components/extensions/test/xpcshell/xpcshell-common.toml @@ -4,6 +4,8 @@ # is the case on desktop Firefox, but not on Thunderbird. # Force pref value to true to get download tests to pass on Thunderbird. prefs = ["browser.download.useDownloadDir=true"] +# Extension tests frequently take more than the default 30s timeout +requesttimeoutfactor = 2 ["test_ChannelWrapper.js"] @@ -47,6 +49,7 @@ skip-if = ["os == 'android'"] # Bug 1545439 ["test_ext_background_early_quit.js"] ["test_ext_background_early_shutdown.js"] +requesttimeoutfactor = 3 # Slow on Linux TSan/ASan (replaces manifest 2x) run-sequentially = ["os == 'mac'"] # frequent fail in parallel on Mac skip-if = ["isolated_process"] # Bug 1709961 @@ -238,6 +241,7 @@ run-sequentially = ["os == 'mac'"] # frequent timeouts in parallel on Mac skip-if = ["os == 'android'"] # Android: downloads.download goes through the embedder app instead of Gecko, and cannot be intercepted. ["test_ext_dnr_dynamic_rules.js"] +requesttimeoutfactor = 3 # Slow on Linux debug (replaces manifest 2x) run-sequentially = ["os == 'mac'"] # frequent timeouts in parallel on Mac ["test_ext_dnr_file_access.js"] @@ -364,6 +368,7 @@ skip-if = ["isolated_process"] # Bug 1709961 ["test_ext_file_access.js"] ["test_ext_geckoProfiler_control.js"] +requesttimeoutfactor = 9 # Slow on Windows (replaces manifest 2x) skip-if = [ "os == 'android'", # Not shipped on Android. "tsan", # tsan: bug 1612707 diff --git a/toolkit/components/extensions/test/xpcshell/xpcshell-legacy-ep.toml b/toolkit/components/extensions/test/xpcshell/xpcshell-legacy-ep.toml @@ -18,6 +18,7 @@ prefs = ["services.settings.server='data:,#remote-settings-dummy/v1'"] # migrate to rkv ["test_ext_permissions.js"] +requesttimeoutfactor = 2 # Slow on debug ["test_ext_permissions_api.js"] diff --git a/toolkit/components/extensions/test/xpcshell/xpcshell-remote.toml b/toolkit/components/extensions/test/xpcshell/xpcshell-remote.toml @@ -11,6 +11,8 @@ support-files = [ "xpcshell-content.toml", ] tags = "webextensions remote-webextensions" +# Extension tests frequently take more than the default 30s timeout +requesttimeoutfactor = 2 # Make sure that loading the default settings for url-classifier-skip-urls # doesn't interfere with running our tests while IDB operations are in diff --git a/toolkit/components/nimbus/test/unit/xpcshell.toml b/toolkit/components/nimbus/test/unit/xpcshell.toml @@ -33,6 +33,7 @@ prefs = [ ["test_ExperimentManager_lifecycle.js"] ["test_ExperimentManager_prefs.js"] +requesttimeoutfactor = 3 # Slow on Linux and Windows skip-if = ["os == 'win' && msix"] # Bug 1991153 ["test_ExperimentManager_unenroll.js"] @@ -48,8 +49,10 @@ skip-if = ["os == 'win' && msix"] # Bug 1991153 ["test_RemoteSettingsExperimentLoader.js"] ["test_RemoteSettingsExperimentLoader_updateRecipes.js"] +requesttimeoutfactor = 2 # Slow on Windows ["test_TargetingContextRecorder.js"] +requesttimeoutfactor = 2 # Slow on Windows skip-if = [ "artifact", "os == 'win' && msix", # Bug 1991153 @@ -58,10 +61,12 @@ skip-if = [ ["test_localization.js"] ["test_nimbusTelemetry.js"] +requesttimeoutfactor = 3 # Slow on Windows msix ["test_policy.js"] ["test_prefFlips.js"] +requesttimeoutfactor = 2 # Slow on Linux and Windows skip-if = [ "os == 'mac' && os_version == '15.30' && arch == 'aarch64'", # Bug 1960885 "os == 'win' && msix", # Bug 1991153 diff --git a/toolkit/components/search/tests/xpcshell/searchconfigs/xpcshell.toml b/toolkit/components/search/tests/xpcshell/searchconfigs/xpcshell.toml @@ -25,6 +25,7 @@ skip-if = [ ["test_distributions.js"] ["test_searchconfig.js"] +requesttimeoutfactor = 3 # Slow on Linux and Windows ["test_searchconfig_google_additional.js"] diff --git a/toolkit/components/telemetry/tests/unit/xpcshell.toml b/toolkit/components/telemetry/tests/unit/xpcshell.toml @@ -21,8 +21,10 @@ skip-if = ["os == 'android'"] # Disabled due to crashes (see bug 1331366) tags = "addons" ["test_CoveragePing.js"] +requesttimeoutfactor = 5 # Slow on Android ["test_EventPing.js"] +requesttimeoutfactor = 5 # Slow on Android tags = "coverage" ["test_HealthPing.js"] @@ -33,8 +35,10 @@ skip-if = [ tags = "addons" ["test_MigratePendingPings.js"] +requesttimeoutfactor = 3 # Slow on Android ["test_PingAPI.js"] +requesttimeoutfactor = 3 # Slow on Android ["test_PingSender.js"] skip-if = ["os == 'android'"] @@ -72,8 +76,10 @@ skip-if = ["os == 'android' && processor == 'x86_64'"] # Disabled as Android/Ge tags = "addons" ["test_TelemetryController_idle.js"] +requesttimeoutfactor = 3 # Slow on Android ["test_TelemetryEnvironment.js"] +requesttimeoutfactor = 2 # Slow on Windows skip-if = [ "os == 'android'", "os == 'win' && msix", # https://bugzilla.mozilla.org/show_bug.cgi?id=1807929 @@ -101,6 +107,7 @@ skip-if = ["os == 'win' && msix"] # https://bugzilla.mozilla.org/show_bug.cgi?id ["test_TelemetryScalars_impressionId.js"] ["test_TelemetrySend.js"] +requesttimeoutfactor = 3 # Slow on Windows skip-if = ["os == 'linux' && ccov"] # Bug 1701874 ["test_TelemetrySendOldPings.js"] @@ -115,6 +122,7 @@ skip-if = ["os == 'linux' && verify && debug"] skip-if = ["os == 'android'"] ["test_TelemetrySession_activeTicks.js"] +requesttimeoutfactor = 3 # Slow on Android ["test_TelemetryTimestamps.js"] diff --git a/toolkit/modules/subprocess/test/xpcshell/xpcshell.toml b/toolkit/modules/subprocess/test/xpcshell/xpcshell.toml @@ -24,5 +24,6 @@ skip-if = [ ["test_subprocess_pathSearch.js"] ["test_subprocess_perf.js"] +requesttimeoutfactor = 2 # Slow on Windows ["test_subprocess_polling.js"] diff --git a/toolkit/modules/tests/xpcshell/xpcshell.toml b/toolkit/modules/tests/xpcshell/xpcshell.toml @@ -99,6 +99,7 @@ skip-if = ["os == 'android'"] ["test_Region.js"] ["test_Region_geocoding.js"] +requesttimeoutfactor = 2 # Slow on debug builds ["test_RustSharedRemoteSettingsService.js"] skip-if = ["os == 'android'"] diff --git a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.toml b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.toml @@ -21,6 +21,7 @@ skip-if = ["os == 'android'"] # Non-extension add-ons are not supported on Andro ["test_AddonRepository_appIsShuttingDown.js"] ["test_AddonRepository_cache.js"] +requesttimeoutfactor = 2 # Slow on Windows skip-if = ["os == 'android'"] # Non-extension add-ons are not supported on Android, but test installs static theme. ["test_AddonRepository_cache_locale.js"]