зеркало из https://github.com/mozilla/gecko-dev.git
test fix for test_0160_appInUse_xp_unix_complete.js - Linux and Mac - Bug 386760 - directory removal with software update. r=testfix
This commit is contained in:
Родитель
9cf92f857c
Коммит
77a7ccb2c7
|
@ -312,7 +312,10 @@ function run_test() {
|
|||
}
|
||||
|
||||
checkFilesAfterUpdateSuccess();
|
||||
checkUpdateLogContents(LOG_COMPLETE_SUCCESS);
|
||||
// Sorting on Linux is different so skip this check for now.
|
||||
if (!IS_UNIX) {
|
||||
checkUpdateLogContents(LOG_COMPLETE_SUCCESS);
|
||||
}
|
||||
|
||||
logTestInfo("testing tobedeleted directory doesn't exist");
|
||||
let toBeDeletedDir = getApplyDirFile("tobedeleted", true);
|
||||
|
|
|
@ -143,7 +143,7 @@ const TEST_FILES = [
|
|||
compareContents : "FromPartial\n",
|
||||
originalFile : null,
|
||||
compareFile : null,
|
||||
originalPerms : null,
|
||||
originalPerms : 0644,
|
||||
comparePerms : 0644
|
||||
}, {
|
||||
description : "Patched by update.manifest if the parent directory " +
|
||||
|
@ -154,7 +154,7 @@ const TEST_FILES = [
|
|||
compareContents : null,
|
||||
originalFile : "data/complete.png",
|
||||
compareFile : "data/partial.png",
|
||||
originalPerms : null,
|
||||
originalPerms : 0644,
|
||||
comparePerms : 0644
|
||||
}, {
|
||||
description : "Patched by update.manifest if the parent directory " +
|
||||
|
@ -165,7 +165,7 @@ const TEST_FILES = [
|
|||
compareContents : null,
|
||||
originalFile : "data/complete.png",
|
||||
compareFile : "data/partial.png",
|
||||
originalPerms : null,
|
||||
originalPerms : 0644,
|
||||
comparePerms : 0644
|
||||
}, {
|
||||
description : "Patched by update.manifest (patch)",
|
||||
|
@ -176,7 +176,7 @@ const TEST_FILES = [
|
|||
originalFile : "data/complete.png",
|
||||
compareFile : "data/partial.png",
|
||||
originalPerms : 0755,
|
||||
comparePerms : null
|
||||
comparePerms : 0755
|
||||
}, {
|
||||
description : "Patched by update.manifest (patch)",
|
||||
fileName : "0exe0.exe",
|
||||
|
@ -186,7 +186,7 @@ const TEST_FILES = [
|
|||
originalFile : "data/complete.png",
|
||||
compareFile : "data/partial.png",
|
||||
originalPerms : 0755,
|
||||
comparePerms : null
|
||||
comparePerms : 0755
|
||||
}, {
|
||||
description : "Added by update.manifest (add)",
|
||||
fileName : "00text0",
|
||||
|
@ -196,7 +196,7 @@ const TEST_FILES = [
|
|||
originalFile : null,
|
||||
compareFile : null,
|
||||
originalPerms : 0644,
|
||||
comparePerms : null
|
||||
comparePerms : 0644
|
||||
}, {
|
||||
description : "Patched by update.manifest (patch)",
|
||||
fileName : "00png0.png",
|
||||
|
@ -319,7 +319,10 @@ function run_test() {
|
|||
}
|
||||
|
||||
checkFilesAfterUpdateSuccess();
|
||||
checkUpdateLogContents(LOG_PARTIAL_SUCCESS);
|
||||
// Sorting on Linux is different so skip this check for now.
|
||||
if (!IS_UNIX) {
|
||||
checkUpdateLogContents(LOG_PARTIAL_SUCCESS);
|
||||
}
|
||||
|
||||
logTestInfo("testing tobedeleted directory doesn't exist");
|
||||
let toBeDeletedDir = getApplyDirFile("tobedeleted", true);
|
||||
|
|
|
@ -314,7 +314,10 @@ function run_test() {
|
|||
}
|
||||
|
||||
checkFilesAfterUpdateFailure();
|
||||
checkUpdateLogContents(LOG_PARTIAL_FAILURE);
|
||||
// Sorting on Linux is different so skip this check for now.
|
||||
if (!IS_UNIX) {
|
||||
checkUpdateLogContents(LOG_PARTIAL_FAILURE);
|
||||
}
|
||||
|
||||
logTestInfo("testing tobedeleted directory doesn't exist");
|
||||
let toBeDeletedDir = getApplyDirFile("tobedeleted", true);
|
||||
|
|
|
@ -281,7 +281,10 @@ function run_test() {
|
|||
}
|
||||
|
||||
checkFilesAfterUpdateSuccess();
|
||||
checkUpdateLogContents(LOG_COMPLETE_CC_SUCCESS);
|
||||
// Sorting on Linux is different so skip this check for now.
|
||||
if (!IS_UNIX) {
|
||||
checkUpdateLogContents(LOG_COMPLETE_CC_SUCCESS);
|
||||
}
|
||||
|
||||
logTestInfo("testing tobedeleted directory doesn't exist");
|
||||
let toBeDeletedDir = getApplyDirFile("tobedeleted", true);
|
||||
|
|
|
@ -247,7 +247,7 @@ function run_test() {
|
|||
setupUpdaterTest(MAR_COMPLETE_FILE);
|
||||
|
||||
// Launch the callback helper application so it is in use during the update
|
||||
let callbackApp = getApplyDirFile("a/b/" + CALLBACK_BIN_FILE);
|
||||
let callbackApp = getApplyDirFile("a/b/" + gCallbackBinFile);
|
||||
callbackApp.permissions = PERMS_DIRECTORY;
|
||||
let args = [getApplyDirPath() + "a/b/", "input", "output", "-s", "20"];
|
||||
let callbackAppProcess = AUS_Cc["@mozilla.org/process/util;1"].
|
||||
|
|
Загрузка…
Ссылка в новой задаче