Bug 1458308 - Remove app.update.auto and app.update.enabled from prefs.rs and marionette.js r=rstrong,ato
authorKirk Steuber <ksteuber@mozilla.com>
Tue, 06 Nov 2018 21:16:19 +0000
changeset 444732 663e1f142dd49d3bc7912a4e7661bdf7d02cda89
parent 444731 1b57a28b1e90c3d3c53c575090f4f98b493e452c
child 444733 766330ff40408bc4df6879bbb5721f6bfb0655b5
push id35001
push userncsoregi@mozilla.com
push dateWed, 07 Nov 2018 09:52:11 +0000
treeherdermozilla-central@bc83ec5a338d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrstrong, ato
bugs1458308
milestone65.0a1
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
Bug 1458308 - Remove app.update.auto and app.update.enabled from prefs.rs and marionette.js r=rstrong,ato `app.update.auto` should actually never have been needed here. `app.update.disabledForTesting`, and before that, `app.update.enabled` will prevent updates altogether. Now that the `app.update.auto` pref is not the correct mechanism for disabling automatic update, this pref should be removed from these files. `app.update.enabled` can also be removed from prefs.rs at this time as per the comment in the file indicating that it can be removed when Firefox 62 stabilizes. Depends on D10315 Differential Revision: https://phabricator.services.mozilla.com/D10780
testing/geckodriver/src/prefs.rs
testing/marionette/components/marionette.js
--- a/testing/geckodriver/src/prefs.rs
+++ b/testing/geckodriver/src/prefs.rs
@@ -7,24 +7,18 @@ use mozprofile::preferences::Pref;
 // so please be careful and get review from a Testing :: geckodriver peer
 // before you make any changes to this file.
 
 lazy_static! {
     pub static ref DEFAULT: Vec<(&'static str, Pref)> = vec![
         // Make sure Shield doesn't hit the network.
         ("app.normandy.api_url", Pref::new("")),
 
-        // Disable automatic downloading of new releases
-        ("app.update.auto", Pref::new(false)),
-
         // Disable automatically upgrading Firefox
         ("app.update.disabledForTesting", Pref::new(true)),
-        // app.update.enabled is being removed. Once Firefox 62 becomes stable,
-        // the line below can be removed as well.
-        ("app.update.enabled", Pref::new(false)),
 
         // Enable the dump function, which sends messages to the system
         // console
         ("browser.dom.window.dump.enabled", Pref::new(true)),
 
         // Disable safebrowsing components
         ("browser.safebrowsing.blockedURIs.enabled", Pref::new(false)),
         ("browser.safebrowsing.downloads.enabled", Pref::new(false)),
--- a/testing/marionette/components/marionette.js
+++ b/testing/marionette/components/marionette.js
@@ -51,22 +51,16 @@ const ENV_PRESERVE_PREFS = "MOZ_MARIONET
 // Where noted, some prefs should also be set in the profile passed to
 // Marionette to prevent them from affecting startup, since some of these
 // are checked before Marionette initialises.
 const RECOMMENDED_PREFS = new Map([
 
   // Make sure Shield doesn't hit the network.
   ["app.normandy.api_url", ""],
 
-  // Disable automatic downloading of new releases.
-  //
-  // This should also be set in the profile prior to starting Firefox,
-  // as it is picked up at runtime.
-  ["app.update.auto", false],
-
   // Disable automatically upgrading Firefox.
   //
   // This should also be set in the profile prior to starting Firefox,
   // as it is picked up at runtime.
   ["app.update.disabledForTesting", true],
   ["security.turn_off_all_security_so_that_viruses_can_take_over_this_computer", true],
 
   // Increase the APZ content response timeout in tests to 1 minute.