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
authorSebastian Hengst <archaeopteryx@coole-files.de>
Fri, 26 May 2017 10:45:04 +0200
changeset 360788 f40289fb94a73eee4bfdb89744c2e905e4577981
parent 360787 14401e0edf829ac7a12dc71a8ad1d8b01c47483c
child 360789 a7c7fd053fa3fc0933bb5e0472a2af0683fe0cde
push id31902
push userryanvm@gmail.com
push dateFri, 26 May 2017 19:43:26 +0000
treeherdermozilla-central@ba1a33add29d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1364068
milestone55.0a1
backs outad54e4734e9b4d8e76fd72bcc5bdb8fec17ec17e
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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
browser/app/profile/firefox.js
toolkit/components/telemetry/tests/unit/head.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1453,18 +1453,16 @@ pref("browser.translation.ui.show", fals
 // Allows to define the translation engine. Bing is default, Yandex may optionally switched on.
 pref("browser.translation.engine", "bing");
 
 // Telemetry settings.
 // Determines if Telemetry pings can be archived locally.
 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);
 pref("experiments.manifest.fetchIntervalSeconds", 86400);
 pref("experiments.manifest.uri", "https://telemetry-experiment.cdn.mozilla.net/manifest/v1/firefox/%VERSION%/%CHANNEL%");
 // Whether experiments are supported by the current application profile.
 pref("experiments.supported", true);
 
--- a/toolkit/components/telemetry/tests/unit/head.js
+++ b/toolkit/components/telemetry/tests/unit/head.js
@@ -302,21 +302,20 @@ if (runningInParent) {
   // Set logging preferences for all the tests.
   Services.prefs.setCharPref("toolkit.telemetry.log.level", "Trace");
   // Telemetry archiving should be on.
   Services.prefs.setBoolPref("toolkit.telemetry.archive.enabled", true);
   // Telemetry xpcshell tests cannot show the infobar.
   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);
 
 
   fakePingSendTimer((callback, timeout) => {
     Services.tm.dispatchToMainThread(() => callback());
   },