Backed out changeset 1b921b7a4df9 (bug 1355818) for bustage
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Mon, 22 May 2017 12:11:14 +0200
changeset 394030 cf1d4e65a1d1b7f2b1d33116669b2298212228c5
parent 394029 0386af1703e2aa3e4ac87667ad5a56a08314bcfe
child 394031 b479558ee0437038dcf55adcb982412268a95ab2
push id7335
push usercbook@mozilla.com
push dateMon, 22 May 2017 10:11:26 +0000
treeherdermozilla-beta@cf1d4e65a1d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1355818
milestone54.0
backs out1b921b7a4df9aa59d6fdff909fd79484b777ca25
Backed out changeset 1b921b7a4df9 (bug 1355818) for bustage
toolkit/mozapps/update/content/updates.js
toolkit/mozapps/update/nsUpdateService.js
toolkit/mozapps/update/tests/chrome/chrome.ini
toolkit/mozapps/update/tests/chrome/utils.js
toolkit/mozapps/update/tests/data/shared.js
--- a/toolkit/mozapps/update/content/updates.js
+++ b/toolkit/mozapps/update/content/updates.js
@@ -749,38 +749,19 @@ var gDownloadingPage = {
     this._pauseButton.disabled = true;
 
     var aus = CoC["@mozilla.org/updates/update-service;1"].
               getService(CoI.nsIApplicationUpdateService);
 
     var um = CoC["@mozilla.org/updates/update-manager;1"].
              getService(CoI.nsIUpdateManager);
     var activeUpdate = um.activeUpdate;
-    if (activeUpdate) {
+    if (activeUpdate)
       gUpdates.setUpdate(activeUpdate);
 
-      // It's possible the update has already been downloaded and is being
-      // applied by the time this page is shown, depending on how fast the
-      // download goes and how quickly the 'next' button is clicked to get here.
-      if (activeUpdate.state == STATE_PENDING ||
-          activeUpdate.state == STATE_PENDING_ELEVATE ||
-          activeUpdate.state == STATE_PENDING_SERVICE) {
-        if (!activeUpdate.getProperty("stagingFailed")) {
-          gUpdates.setButtons("hideButton", null, null, false);
-          gUpdates.wiz.getButton("extra1").focus();
-
-          this._setUpdateApplying();
-          return;
-        }
-
-        gUpdates.wiz.goTo("finished");
-        return;
-      }
-    }
-
     if (!gUpdates.update) {
       LOG("gDownloadingPage", "onPageShow - no valid update to download?!");
       return;
     }
 
     this._startTime = Date.now();
 
     try {
@@ -1220,27 +1201,20 @@ var gErrorPatchingPage = {
   onPageShow() {
     gUpdates.setButtons(null, null, "okButton", true);
   },
 
   onWizardNext() {
     switch (gUpdates.update.selectedPatch.state) {
       case STATE_APPLIED:
       case STATE_APPLIED_SERVICE:
-        gUpdates.wiz.goTo("finished");
-        break;
       case STATE_PENDING:
       case STATE_PENDING_SERVICE:
-        let aus = CoC["@mozilla.org/updates/update-service;1"].
-                  getService(CoI.nsIApplicationUpdateService);
-        if (!aus.canStageUpdates) {
-          gUpdates.wiz.goTo("finished");
-          break;
-        }
-      // intentional fallthrough
+        gUpdates.wiz.goTo("finished");
+        break;
       case STATE_DOWNLOADING:
         gUpdates.wiz.goTo("downloading");
         break;
       case STATE_DOWNLOAD_FAILED:
         gUpdates.wiz.goTo("errors");
         break;
     }
   }
--- a/toolkit/mozapps/update/nsUpdateService.js
+++ b/toolkit/mozapps/update/nsUpdateService.js
@@ -3112,19 +3112,16 @@ UpdateManager.prototype = {
     // update is downloaded. By passing false the patch directory won't be
     // removed.
     cleanUpUpdatesDir(false);
 
     if (update.state == STATE_FAILED && parts[1]) {
       if (!handleUpdateFailure(update, parts[1])) {
         handleFallbackToCompleteUpdate(update, true);
       }
-
-      update.QueryInterface(Ci.nsIWritablePropertyBag);
-      update.setProperty("stagingFailed", "true");
     }
     if (update.state == STATE_APPLIED && shouldUseService()) {
       writeStatusFile(getUpdatesDir(), update.state = STATE_APPLIED_SERVICE);
     }
 
     // Send an observer notification which the update wizard uses in
     // order to update its UI.
     LOG("UpdateManager:refreshUpdateStatus - Notifying observers that " +
--- a/toolkit/mozapps/update/tests/chrome/chrome.ini
+++ b/toolkit/mozapps/update/tests/chrome/chrome.ini
@@ -24,19 +24,16 @@ reason = Bug 1168003
 [test_0071_notify_verifyFailPartial_noComplete.xul]
 [test_0072_notify_verifyFailComplete_noPartial.xul]
 [test_0073_notify_verifyFailPartialComplete.xul]
 [test_0074_notify_verifyFailPartial_successComplete.xul]
 [test_0081_error_patchApplyFailure_partial_only.xul]
 [test_0082_error_patchApplyFailure_complete_only.xul]
 [test_0083_error_patchApplyFailure_partial_complete.xul]
 [test_0084_error_patchApplyFailure_verify_failed.xul]
-[test_0085_error_patchApplyFailure_partial_complete_staging.xul]
-skip-if = asan
-reason = Bug 1168003
 [test_0092_finishedBackground.xul]
 [test_0093_restartNotification.xul]
 [test_0094_restartNotification_remote.xul]
 [test_0095_restartNotification_remoteInvalidNumber.xul]
 [test_0096_restartNotification_stagedBackground.xul]
 skip-if = asan
 reason = Bug 1168003
 [test_0097_restartNotification_stagedServiceBackground.xul]
--- a/toolkit/mozapps/update/tests/chrome/utils.js
+++ b/toolkit/mozapps/update/tests/chrome/utils.js
@@ -808,17 +808,16 @@ function setupPrefs() {
   if (Services.prefs.prefHasUserValue(PREF_APP_UPDATE_STAGING_ENABLED)) {
     gAppUpdateStagingEnabled = Services.prefs.getBoolPref(PREF_APP_UPDATE_STAGING_ENABLED);
   }
   Services.prefs.setBoolPref(PREF_APP_UPDATE_STAGING_ENABLED, false);
 
   Services.prefs.setIntPref(PREF_APP_UPDATE_IDLETIME, 0);
   Services.prefs.setIntPref(PREF_APP_UPDATE_PROMPTWAITTIME, 0);
   Services.prefs.setBoolPref(PREF_APP_UPDATE_SILENT, false);
-  Services.prefs.setIntPref(PREF_APP_UPDATE_DOWNLOADBACKGROUNDINTERVAL, 0);
 }
 
 /**
  * Restores files that were backed up for the tests and general file cleanup.
  */
 function resetFiles() {
   // Restore the backed up updater-settings.ini if it exists.
   let baseAppDir = getGREDir();
@@ -902,20 +901,16 @@ function resetPrefs() {
   if (Services.prefs.prefHasUserValue(PREF_APP_UPDATE_BACKGROUNDERRORS)) {
     Services.prefs.clearUserPref(PREF_APP_UPDATE_BACKGROUNDERRORS);
   }
 
   if (Services.prefs.prefHasUserValue(PREF_APP_UPDATE_BACKGROUNDMAXERRORS)) {
     Services.prefs.clearUserPref(PREF_APP_UPDATE_BACKGROUNDMAXERRORS);
   }
 
-  if (Services.prefs.prefHasUserValue(PREF_APP_UPDATE_DOWNLOADBACKGROUNDINTERVAL)) {
-    Services.prefs.clearUserPref(PREF_APP_UPDATE_DOWNLOADBACKGROUNDINTERVAL);
-  }
-
   try {
     Services.prefs.deleteBranch(PREFBRANCH_APP_UPDATE_NEVER);
   } catch (e) {
   }
 }
 
 function setupTimer(aTestTimeout) {
   gTestTimeout = aTestTimeout;
--- a/toolkit/mozapps/update/tests/data/shared.js
+++ b/toolkit/mozapps/update/tests/data/shared.js
@@ -7,17 +7,16 @@
 
 Cu.import("resource://gre/modules/FileUtils.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 const PREF_APP_UPDATE_AUTO                 = "app.update.auto";
 const PREF_APP_UPDATE_BACKGROUNDERRORS     = "app.update.backgroundErrors";
 const PREF_APP_UPDATE_BACKGROUNDMAXERRORS  = "app.update.backgroundMaxErrors";
 const PREF_APP_UPDATE_CHANNEL              = "app.update.channel";
-const PREF_APP_UPDATE_DOWNLOADBACKGROUNDINTERVAL = "app.update.download.backgroundInterval";
 const PREF_APP_UPDATE_ENABLED              = "app.update.enabled";
 const PREF_APP_UPDATE_IDLETIME             = "app.update.idletime";
 const PREF_APP_UPDATE_LOG                  = "app.update.log";
 const PREF_APP_UPDATE_NOTIFIEDUNSUPPORTED  = "app.update.notifiedUnsupported";
 const PREF_APP_UPDATE_PROMPTWAITTIME       = "app.update.promptWaitTime";
 const PREF_APP_UPDATE_RETRYTIMEOUT         = "app.update.socket.retryTimeout";
 const PREF_APP_UPDATE_SERVICE_ENABLED      = "app.update.service.enabled";
 const PREF_APP_UPDATE_SILENT               = "app.update.silent";