Bug 1358336 - followup test only fix to handle the different staging location on OS X. r=me
authorRobert Strong <robert.bugzilla@gmail.com>
Fri, 28 Apr 2017 18:12:00 -0700
changeset 355779 8e48a8ed30e78ef774befe4e617c25ced2c992c5
parent 355778 e122e204acc8eab1f93b9dc93923ec3136770568
child 355780 21447217ddbd0350120bb26de3d2906afd9970e8
push id31740
push userarchaeopteryx@coole-files.de
push dateSat, 29 Apr 2017 19:31:26 +0000
treeherdermozilla-central@2fe636103d71 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1358336
milestone55.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 1358336 - followup test only fix to handle the different staging location on OS X. r=me
toolkit/mozapps/update/tests/unit_base_updater/marAppApplyUpdateStageOldVersionFailure.js
--- a/toolkit/mozapps/update/tests/unit_base_updater/marAppApplyUpdateStageOldVersionFailure.js
+++ b/toolkit/mozapps/update/tests/unit_base_updater/marAppApplyUpdateStageOldVersionFailure.js
@@ -61,17 +61,17 @@ function runUpdateFinished() {
   Assert.ok(!gUpdateManager.activeUpdate,
             "the active update should not be defined");
   Assert.equal(gUpdateManager.updateCount, 1,
                "the update manager updateCount attribute" + MSG_SHOULD_EQUAL);
   Assert.equal(gUpdateManager.getUpdateAt(0).state, STATE_AFTER_STAGE,
                "the update state" + MSG_SHOULD_EQUAL);
   checkPostUpdateRunningFile(false);
   setTestFilesAndDirsForFailure();
-  checkFilesAfterUpdateFailure(getApplyDirFile, true, false);
+  checkFilesAfterUpdateFailure(getApplyDirFile, IS_MACOSX ? false : true, false);
 
   let updatesDir = getUpdatesPatchDir();
   Assert.ok(updatesDir.exists(),
             MSG_SHOULD_EXIST + getMsgPath(updatesDir.path));
 
   let log = getUpdateLog(FILE_UPDATE_LOG);
   Assert.ok(!log.exists(),
             MSG_SHOULD_NOT_EXIST + getMsgPath(log.path));