Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-09 05:14:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Test fix for Bug 889860 - Intermittent test_0200_app_launch_apply_update.js | Test timed out | test failed (with xpcshell return code: 1). r=bbondy

Browse Source
This commit is contained in:
Robert Strong 2013-07-05 13:11:44 -07:00
parent 3338bb00a8
commit c13e15807d
1 changed files with 57 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
toolkit/mozapps/update/test/unit/test_0200_app_launch_apply_update.js
View File

@ -224,14 +224,15 @@ function getUpdateTestDir() {
} }
/** /**
* Checks if the update has finished and if it has finished performs checks for * Checks if the update has finished, renames the update.log file to make
* the test. * sure it is not in use, and then calls restoreLogFile to continue the test.
*/ */
function checkUpdateFinished() { function checkUpdateFinished() {
gTimeoutRuns++; gTimeoutRuns++;
// Don't proceed until the update.log has been created. // Don't proceed until the update.log has been created.
let log = getUpdatesDir(); let updatesDir = getUpdatesDir();
log.append("0"); updatesDir.append("0");
let log = updatesDir.clone();
log.append(FILE_UPDATE_LOG); log.append(FILE_UPDATE_LOG);
if (!log.exists()) { if (!log.exists()) {
if (gTimeoutRuns > MAX_TIMEOUT_RUNS) if (gTimeoutRuns > MAX_TIMEOUT_RUNS)
@ -253,6 +254,53 @@ function checkUpdateFinished() {
return; return;
} }
// Don't proceed until the update.log file can be renamed to update.log.bak
// (bug 889860).
try {
log.moveTo(updatesDir, FILE_UPDATE_LOG + ".bak");
}
catch (e) {
logTestInfo("unable to rename file " + FILE_UPDATE_LOG + " to " +
FILE_UPDATE_LOG + ".bak. Exception: " + e);
if (gTimeoutRuns > MAX_TIMEOUT_RUNS)
do_throw("Exceeded MAX_TIMEOUT_RUNS whilst waiting to be able to " +
"rename " + FILE_UPDATE_LOG + " to " + FILE_UPDATE_LOG +
".bak. Path: " + log.path);
else
do_timeout(CHECK_TIMEOUT_MILLI, checkUpdateFinished);
return;
}
restoreLogFile();
}
/**
* Checks if the renamed the update.log file can be renamed back to make
* sure it is not in use and if so, continues the test.
*/
function restoreLogFile() {
gTimeoutRuns++;
// Don't proceed until the update.log.bak file can be renamed back to
// update.log (bug 889860).
let updatesDir = getUpdatesDir();
updatesDir.append("0");
let log = updatesDir.clone();
log.append(FILE_UPDATE_LOG + ".bak");
try {
log.moveTo(updatesDir, FILE_UPDATE_LOG);
}
catch (e) {
logTestInfo("unable to rename file " + FILE_UPDATE_LOG + ".bak back to " +
FILE_UPDATE_LOG + ". Exception: " + e);
if (gTimeoutRuns > MAX_TIMEOUT_RUNS)
do_throw("Exceeded MAX_TIMEOUT_RUNS whilst waiting to be able to " +
"rename " + FILE_UPDATE_LOG + ".bak back to " + FILE_UPDATE_LOG +
". Path: " + log.path);
else
do_timeout(CHECK_TIMEOUT_MILLI, restoreLogFile);
return;
}
// Log the contents of the update.log so it is simpler to diagnose a test // Log the contents of the update.log so it is simpler to diagnose a test
// failure. For example, on Windows if the application binary is in use the // failure. For example, on Windows if the application binary is in use the
// updater will not apply the update. // updater will not apply the update.
@ -264,6 +312,7 @@ function checkUpdateFinished() {
do_throw("the application can't be in use when running this test"); do_throw("the application can't be in use when running this test");
} }
let status = readStatusFile();
do_check_eq(status, STATE_SUCCEEDED); do_check_eq(status, STATE_SUCCEEDED);
standardInit(); standardInit();
@ -290,6 +339,10 @@ function checkUpdateFinished() {
checkLogRenameFinished(); checkLogRenameFinished();
} }
/**
* Checks if the update.log file has been renamed after launch and if so,
* continues the test.
*/
function checkLogRenameFinished() { function checkLogRenameFinished() {
gTimeoutRuns++; gTimeoutRuns++;
// Don't proceed until the update.log has been renamed to last-update.log. // Don't proceed until the update.log has been renamed to last-update.log.