Bug 1095128: Make sure add-on updates remain disabled after each browser chrome test.
authorDave Townsend <dtownsend@oxymoronical.com>
Tue, 18 Nov 2014 09:18:51 -0800
changeset 216371 121a5cc63382816393d515993817925c41c1f2f7
parent 216370 a8a9d42356c8bdf21f91432d28a0999b59a44057
child 216372 e15cb9b338278fb232d64f6d688ed59e90e80eec
push id52026
push userkwierso@gmail.com
push dateWed, 19 Nov 2014 02:37:17 +0000
treeherdermozilla-inbound@d197d16c0caa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1095128
milestone36.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 1095128: Make sure add-on updates remain disabled after each browser chrome test.
toolkit/mozapps/extensions/test/browser/browser_bug586574.js
toolkit/mozapps/extensions/test/browser/head.js
--- a/toolkit/mozapps/extensions/test/browser/browser_bug586574.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_bug586574.js
@@ -16,25 +16,20 @@ var gProvider;
 
 var gUtilsBtn;
 var gUtilsMenu;
 var gDropdownMenu;
 var gSetDefault;
 var gResetToAutomatic;
 var gResetToManual;
 
-// Remember and restore preferences for this test, and make sure
-// we don't accidentally start a background update while the prefs
+// Make sure we don't accidentally start a background update while the prefs
 // are enabled.
 disableBackgroundUpdateTimer();
-var updatesEnabled = Services.prefs.getBoolPref(PREF_UPDATE_ENABLED);
-var autoDefault = Services.prefs.getBoolPref(PREF_AUTOUPDATE_DEFAULT);
 registerCleanupFunction(() => {
-  Services.prefs.setBoolPref(PREF_UPDATE_ENABLED, updatesEnabled);
-  Services.prefs.setBoolPref(PREF_AUTOUPDATE_DEFAULT, autoDefault);
   enableBackgroundUpdateTimer();
 });
 
 function test() {
   waitForExplicitFinish();
 
   gProvider = new MockProvider();
 
--- a/toolkit/mozapps/extensions/test/browser/head.js
+++ b/toolkit/mozapps/extensions/test/browser/head.js
@@ -60,16 +60,18 @@ var gTestsRun = 0;
 var gTestStart = null;
 
 var gUseInContentUI = !gTestInWindow && ("switchToTabHavingURI" in window);
 
 var gRestorePrefs = [{name: PREF_LOGGING_ENABLED},
                      {name: "extensions.webservice.discoverURL"},
                      {name: "extensions.update.url"},
                      {name: "extensions.update.background.url"},
+                     {name: "extensions.update.enabled"},
+                     {name: "extensions.update.autoUpdateDefault"},
                      {name: "extensions.getAddons.get.url"},
                      {name: "extensions.getAddons.getWithPerformance.url"},
                      {name: "extensions.getAddons.search.browseURL"},
                      {name: "extensions.getAddons.search.url"},
                      {name: "extensions.getAddons.cache.enabled"},
                      {name: "devtools.chrome.enabled"},
                      {name: "devtools.debugger.remote-enabled"},
                      {name: PREF_SEARCH_MAXRESULTS},