Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-15 11:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset ad54e4734e9b (bug 1364068) for test suites timing out on Linux x64 opt/pgo and Win 7 VM opt and timeout of browser_addons_debug_webextension.js on OSX. r=backout

Browse Source
This commit is contained in:
Sebastian Hengst 2017-05-26 10:45:04 +02:00
parent 7586e917b7
commit 03800fc2af
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/app/profile/firefox.js
View File

@ -1458,8 +1458,6 @@ pref("browser.translation.engine", "bing");
pref("toolkit.telemetry.archive.enabled", true);
// Enables sending the shutdown ping when Firefox shuts down.
pref("toolkit.telemetry.shutdownPingSender.enabled", true);
// Enables sending the 'new-profile' ping on new profiles.
pref("toolkit.telemetry.newProfilePing.enabled", true);
// Telemetry experiments settings.
pref("experiments.enabled", true);

7
toolkit/components/telemetry/tests/unit/head.js
View File

@ -307,11 +307,10 @@ if (runningInParent) {
Services.prefs.setBoolPref("datareporting.policy.dataSubmissionPolicyBypassNotification", true);
// FHR uploads should be enabled.
Services.prefs.setBoolPref("datareporting.healthreport.uploadEnabled", true);
// Many tests expect the shutdown and the new-profile to not be sent on shutdown
// and will fail if receive an unexpected ping. Let's globally disable these features:
// the relevant tests will enable these prefs when needed.
// Many tests expect the shutdown ping to not be sent on shutdown and will fail
// if receive an unexpected ping. Let's globally disable the shutdown ping sender:
// the relevant tests will enable this pref when needed.
Services.prefs.setBoolPref("toolkit.telemetry.shutdownPingSender.enabled", false);
Services.prefs.setBoolPref("toolkit.telemetry.newProfilePing.enabled", false);
// Ensure browser experiments are also disabled, to avoid network activity
// when toggling PREF_ENABLED.
Services.prefs.setBoolPref("experiments.enabled", false);