Bug 615467 - intermittent failure in toolkit\mozapps\update\test\unit\test_0170_fileLocked_xp_win_complete.js | test failed (with xpcshell return code: 0), see following log: succeeded == failed. r=dtownsend, a=test fix

This commit is contained in:
Robert Strong 2010-12-02 19:57:20 -08:00
Родитель dc094b28b6
Коммит 83b18f230c
6 изменённых файлов: 18 добавлений и 6 удалений

Просмотреть файл

@ -9,6 +9,8 @@ const TEST_ID = "0160";
// X Launch Services invalidates its cache so the test allows up to one minute // X Launch Services invalidates its cache so the test allows up to one minute
// difference in the last modified time. // difference in the last modified time.
const MAX_TIME_DIFFERENCE = 60000; const MAX_TIME_DIFFERENCE = 60000;
// Time to wait for the test helper process to start before continuing the test
const TEST_HELPER_TIMEOUT = 1000;
// The files are in the same order as they are applied from the mar // The files are in the same order as they are applied from the mar
const TEST_FILES = [ const TEST_FILES = [
@ -86,7 +88,7 @@ function run_test() {
// Give the lock file process time to lock the file before updating otherwise // Give the lock file process time to lock the file before updating otherwise
// this test can fail intermittently on Windows debug builds. // this test can fail intermittently on Windows debug builds.
do_timeout(100, testUpdate); do_timeout(TEST_HELPER_TIMEOUT, testUpdate);
} }
function end_test() { function end_test() {

Просмотреть файл

@ -5,6 +5,8 @@
/* Application in use complete MAR file patch apply failure test */ /* Application in use complete MAR file patch apply failure test */
const TEST_ID = "0160"; const TEST_ID = "0160";
// Time to wait for the test helper process to start before continuing the test
const TEST_HELPER_TIMEOUT = 1000;
// The files are in the same order as they are applied from the mar // The files are in the same order as they are applied from the mar
const TEST_FILES = [ const TEST_FILES = [
@ -70,7 +72,7 @@ function run_test() {
// Give the lock file process time to lock the file before updating otherwise // Give the lock file process time to lock the file before updating otherwise
// this test can fail intermittently on Windows debug builds. // this test can fail intermittently on Windows debug builds.
do_timeout(100, testUpdate); do_timeout(TEST_HELPER_TIMEOUT, testUpdate);
} }
function end_test() { function end_test() {

Просмотреть файл

@ -5,6 +5,8 @@
/* File locked complete MAR file patch apply failure test */ /* File locked complete MAR file patch apply failure test */
const TEST_ID = "0170"; const TEST_ID = "0170";
// Time to wait for the test helper process to start before continuing the test
const TEST_HELPER_TIMEOUT = 1000;
// The files are in the same order as they are applied from the mar // The files are in the same order as they are applied from the mar
const TEST_FILES = [ const TEST_FILES = [
@ -69,7 +71,7 @@ function run_test() {
// Give the lock file process time to lock the file before updating otherwise // Give the lock file process time to lock the file before updating otherwise
// this test can fail intermittently on Windows debug builds. // this test can fail intermittently on Windows debug builds.
do_timeout(100, testUpdate); do_timeout(TEST_HELPER_TIMEOUT, testUpdate);
} }
function end_test() { function end_test() {

Просмотреть файл

@ -5,6 +5,8 @@
/* File locked partial MAR file patch apply failure test */ /* File locked partial MAR file patch apply failure test */
const TEST_ID = "0171"; const TEST_ID = "0171";
// Time to wait for the test helper process to start before continuing the test
const TEST_HELPER_TIMEOUT = 1000;
// The files are in the same order as they are applied from the mar // The files are in the same order as they are applied from the mar
const TEST_FILES = [ const TEST_FILES = [
@ -69,7 +71,7 @@ function run_test() {
// Give the lock file process time to lock the file before updating otherwise // Give the lock file process time to lock the file before updating otherwise
// this test can fail intermittently on Windows debug builds. // this test can fail intermittently on Windows debug builds.
do_timeout(100, testUpdate); do_timeout(TEST_HELPER_TIMEOUT, testUpdate);
} }
function end_test() { function end_test() {

Просмотреть файл

@ -5,6 +5,8 @@
/* File in use complete MAR file patch apply success test */ /* File in use complete MAR file patch apply success test */
const TEST_ID = "0180"; const TEST_ID = "0180";
// Time to wait for the test helper process to start before continuing the test
const TEST_HELPER_TIMEOUT = 1000;
// The files are in the same order as they are applied from the mar // The files are in the same order as they are applied from the mar
const TEST_FILES = [ const TEST_FILES = [
@ -69,7 +71,7 @@ function run_test() {
// Give the file in use process time to launch before updating otherwise this // Give the file in use process time to launch before updating otherwise this
// test can fail intermittently on Windows debug builds. // test can fail intermittently on Windows debug builds.
do_timeout(100, testUpdate); do_timeout(TEST_HELPER_TIMEOUT, testUpdate);
} }
function end_test() { function end_test() {

Просмотреть файл

@ -6,6 +6,8 @@
const TEST_ID = "0181"; const TEST_ID = "0181";
const MAR_IN_USE_WIN_FILE = "data/partial_in_use_win.mar"; const MAR_IN_USE_WIN_FILE = "data/partial_in_use_win.mar";
// Time to wait for the test helper process to start before continuing the test
const TEST_HELPER_TIMEOUT = 1000;
// The files are in the same order as they are applied from the mar // The files are in the same order as they are applied from the mar
var TEST_FILES = [ var TEST_FILES = [
@ -84,7 +86,7 @@ function run_test() {
// Give the file in use process time to launch before updating otherwise this // Give the file in use process time to launch before updating otherwise this
// test can fail intermittently on Windows debug builds. // test can fail intermittently on Windows debug builds.
do_timeout(100, testUpdate); do_timeout(TEST_HELPER_TIMEOUT, testUpdate);
} }
function end_test() { function end_test() {