mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 650254 - Permanent fail on update xpcshell tests for Thunderbird | TEST-UNEXPECTED-FAIL | test_0110_general.js and co failing in head_update.js. r=mossop

This commit is contained in:
Robert Strong 2011-04-19 11:03:57 -07:00
Родитель 47322a8c6b
Коммит b46a005045
5 изменённых файлов: 38 добавлений и 58 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

34
toolkit/mozapps/update/test/unit/data/complete_cc_log_success
Просмотреть файл

@ -94,8 +94,6 @@ PREPARE REMOVEFILE a/b/7/71/7xtest.exe
PREPARE REMOVEFILE a/b/7/71/7xtext0
PREPARE REMOVEFILE a/b/7/71/7xtext1
PREPARE REMOVEDIR a/b/7/71/
PREPARE REMOVEFILE a/b/7/7text0
PREPARE REMOVEFILE a/b/7/7text1
PREPARE REMOVEDIR a/b/7/
PREPARE REMOVEDIR a/b/6/
PREPARE REMOVEFILE a/b/5/5text1
@ -203,8 +201,6 @@ EXECUTE REMOVEFILE a/b/7/71/7xtest.exe
EXECUTE REMOVEFILE a/b/7/71/7xtext0
EXECUTE REMOVEFILE a/b/7/71/7xtext1
EXECUTE REMOVEDIR a/b/7/71/
EXECUTE REMOVEFILE a/b/7/7text0
EXECUTE REMOVEFILE a/b/7/7text1
EXECUTE REMOVEDIR a/b/7/
EXECUTE REMOVEDIR a/b/6/
EXECUTE REMOVEFILE a/b/5/5text1
@ -233,27 +229,27 @@ FINISH REMOVEFILE a/b/2/20/20png0.png
FINISH REMOVEFILE a/b/0/0exe0.exe
FINISH REMOVEFILE a/b/0/00/00text0
FINISH REMOVEDIR a/b/searchplugins/
a/b/searchplugins/, rv: 0
removing directory: a/b/searchplugins/, rv: 0
FINISH REMOVEDIR a/b/extensions/extensions1/
a/b/extensions/extensions1/, rv: 0
removing directory: a/b/extensions/extensions1/, rv: 0
FINISH REMOVEDIR a/b/extensions/extensions0/
a/b/extensions/extensions0/, rv: 0
removing directory: a/b/extensions/extensions0/, rv: 0
FINISH REMOVEDIR a/b/extensions/
a/b/extensions/, rv: 0
removing directory: a/b/extensions/, rv: 0
FINISH REMOVEDIR a/b/defaults/pref/
a/b/defaults/pref/, rv: 0
removing directory: a/b/defaults/pref/, rv: 0
FINISH REMOVEDIR a/b/defaults/
a/b/defaults/, rv: 0
removing directory: a/b/defaults/, rv: 0
FINISH REMOVEDIR a/b/2/20/
FINISH REMOVEDIR a/b/2/
FINISH REMOVEDIR a/b/0/00/
a/b/0/00/, rv: 0
removing directory: a/b/0/00/, rv: 0
FINISH REMOVEDIR a/b/0/
a/b/0/, rv: 0
removing directory: a/b/0/, rv: 0
FINISH REMOVEDIR a/b/
a/b/, rv: 0
removing directory: a/b/, rv: 0
FINISH REMOVEDIR a/
a/, rv: 0
removing directory: a/, rv: 0
FINISH ADD a/b/defaults/pref/channel-prefs.js
FINISH ADD precomplete
FINISH ADD a/b/searchplugins/searchpluginstext0
@ -294,9 +290,9 @@ FINISH REMOVEDIR a/b/9/94/
directory no longer exists; skipping
FINISH REMOVEDIR a/b/9/93/
FINISH REMOVEDIR a/b/9/92/
a/b/9/92/, rv: 0
removing directory: a/b/9/92/, rv: 0
FINISH REMOVEDIR a/b/9/91/
a/b/9/91/, rv: 0
removing directory: a/b/9/91/, rv: 0
FINISH REMOVEDIR a/b/9/90/
FINISH REMOVEDIR a/b/9/90/
directory no longer exists; skipping
@ -322,9 +318,9 @@ FINISH REMOVEDIR a/b/8/84/
directory no longer exists; skipping
FINISH REMOVEDIR a/b/8/83/
FINISH REMOVEDIR a/b/8/82/
a/b/8/82/, rv: 0
removing directory: a/b/8/82/, rv: 0
FINISH REMOVEDIR a/b/8/81/
a/b/8/81/, rv: 0
removing directory: a/b/8/81/, rv: 0
FINISH REMOVEDIR a/b/8/80/
FINISH REMOVEDIR a/b/8/80/
directory no longer exists; skipping
@ -336,8 +332,6 @@ FINISH REMOVEFILE a/b/7/71/7xtest.exe
FINISH REMOVEFILE a/b/7/71/7xtext0
FINISH REMOVEFILE a/b/7/71/7xtext1
FINISH REMOVEDIR a/b/7/71/
FINISH REMOVEFILE a/b/7/7text0
FINISH REMOVEFILE a/b/7/7text1
FINISH REMOVEDIR a/b/7/
FINISH REMOVEDIR a/b/6/
FINISH REMOVEFILE a/b/5/5text1

34
toolkit/mozapps/update/test/unit/data/complete_log_success
Просмотреть файл

@ -91,8 +91,6 @@ PREPARE REMOVEFILE a/b/7/71/7xtest.exe
PREPARE REMOVEFILE a/b/7/71/7xtext0
PREPARE REMOVEFILE a/b/7/71/7xtext1
PREPARE REMOVEDIR a/b/7/71/
PREPARE REMOVEFILE a/b/7/7text0
PREPARE REMOVEFILE a/b/7/7text1
PREPARE REMOVEDIR a/b/7/
PREPARE REMOVEDIR a/b/6/
PREPARE REMOVEFILE a/b/5/5text1
@ -198,8 +196,6 @@ EXECUTE REMOVEFILE a/b/7/71/7xtest.exe
EXECUTE REMOVEFILE a/b/7/71/7xtext0
EXECUTE REMOVEFILE a/b/7/71/7xtext1
EXECUTE REMOVEDIR a/b/7/71/
EXECUTE REMOVEFILE a/b/7/7text0
EXECUTE REMOVEFILE a/b/7/7text1
EXECUTE REMOVEDIR a/b/7/
EXECUTE REMOVEDIR a/b/6/
EXECUTE REMOVEFILE a/b/5/5text1
@ -227,27 +223,27 @@ FINISH REMOVEFILE a/b/2/20/20png0.png
FINISH REMOVEFILE a/b/0/0exe0.exe
FINISH REMOVEFILE a/b/0/00/00text0
FINISH REMOVEDIR a/b/searchplugins/
a/b/searchplugins/, rv: 0
removing directory: a/b/searchplugins/, rv: 0
FINISH REMOVEDIR a/b/extensions/extensions1/
a/b/extensions/extensions1/, rv: 0
removing directory: a/b/extensions/extensions1/, rv: 0
FINISH REMOVEDIR a/b/extensions/extensions0/
a/b/extensions/extensions0/, rv: 0
removing directory: a/b/extensions/extensions0/, rv: 0
FINISH REMOVEDIR a/b/extensions/
a/b/extensions/, rv: 0
removing directory: a/b/extensions/, rv: 0
FINISH REMOVEDIR a/b/defaults/pref/
a/b/defaults/pref/, rv: 0
removing directory: a/b/defaults/pref/, rv: 0
FINISH REMOVEDIR a/b/defaults/
a/b/defaults/, rv: 0
removing directory: a/b/defaults/, rv: 0
FINISH REMOVEDIR a/b/2/20/
FINISH REMOVEDIR a/b/2/
FINISH REMOVEDIR a/b/0/00/
a/b/0/00/, rv: 0
removing directory: a/b/0/00/, rv: 0
FINISH REMOVEDIR a/b/0/
a/b/0/, rv: 0
removing directory: a/b/0/, rv: 0
FINISH REMOVEDIR a/b/
a/b/, rv: 0
removing directory: a/b/, rv: 0
FINISH REMOVEDIR a/
a/, rv: 0
removing directory: a/, rv: 0
FINISH ADD precomplete
FINISH ADD a/b/searchplugins/searchpluginstext0
FINISH ADD a/b/searchplugins/searchpluginspng1.png
@ -287,9 +283,9 @@ FINISH REMOVEDIR a/b/9/94/
directory no longer exists; skipping
FINISH REMOVEDIR a/b/9/93/
FINISH REMOVEDIR a/b/9/92/
a/b/9/92/, rv: 0
removing directory: a/b/9/92/, rv: 0
FINISH REMOVEDIR a/b/9/91/
a/b/9/91/, rv: 0
removing directory: a/b/9/91/, rv: 0
FINISH REMOVEDIR a/b/9/90/
FINISH REMOVEDIR a/b/9/90/
directory no longer exists; skipping
@ -315,9 +311,9 @@ FINISH REMOVEDIR a/b/8/84/
directory no longer exists; skipping
FINISH REMOVEDIR a/b/8/83/
FINISH REMOVEDIR a/b/8/82/
a/b/8/82/, rv: 0
removing directory: a/b/8/82/, rv: 0
FINISH REMOVEDIR a/b/8/81/
a/b/8/81/, rv: 0
removing directory: a/b/8/81/, rv: 0
FINISH REMOVEDIR a/b/8/80/
FINISH REMOVEDIR a/b/8/80/
directory no longer exists; skipping
@ -329,8 +325,6 @@ FINISH REMOVEFILE a/b/7/71/7xtest.exe
FINISH REMOVEFILE a/b/7/71/7xtext0
FINISH REMOVEFILE a/b/7/71/7xtext1
FINISH REMOVEDIR a/b/7/71/
FINISH REMOVEFILE a/b/7/7text0
FINISH REMOVEFILE a/b/7/7text1
FINISH REMOVEDIR a/b/7/
FINISH REMOVEDIR a/b/6/
FINISH REMOVEFILE a/b/5/5text1

6
toolkit/mozapps/update/test/unit/data/partial_log_failure
Просмотреть файл

@ -72,8 +72,6 @@ PREPARE REMOVEFILE a/b/7/71/7xtest.exe
PREPARE REMOVEFILE a/b/7/71/7xtext0
PREPARE REMOVEFILE a/b/7/71/7xtext1
PREPARE REMOVEDIR a/b/7/71/
PREPARE REMOVEFILE a/b/7/7text0
PREPARE REMOVEFILE a/b/7/7text1
PREPARE REMOVEDIR a/b/7/
PREPARE REMOVEDIR a/b/6/
PREPARE REMOVEFILE a/b/5/5text1
@ -168,10 +166,6 @@ FINISH REMOVEFILE a/b/7/71/7xtext0
backup_restore: backup file doesn't exist: a/b/7/71/7xtext0.moz-backup
FINISH REMOVEFILE a/b/7/71/7xtext1
backup_restore: backup file doesn't exist: a/b/7/71/7xtext1.moz-backup
FINISH REMOVEFILE a/b/7/7text0
backup_restore: backup file doesn't exist: a/b/7/7text0.moz-backup
FINISH REMOVEFILE a/b/7/7text1
backup_restore: backup file doesn't exist: a/b/7/7text1.moz-backup
FINISH REMOVEFILE a/b/5/5text1
backup_restore: backup file doesn't exist: a/b/5/5text1.moz-backup
FINISH REMOVEFILE a/b/5/5text0

14
toolkit/mozapps/update/test/unit/data/partial_log_success
Просмотреть файл

@ -72,8 +72,6 @@ PREPARE REMOVEFILE a/b/7/71/7xtest.exe
PREPARE REMOVEFILE a/b/7/71/7xtext0
PREPARE REMOVEFILE a/b/7/71/7xtext1
PREPARE REMOVEDIR a/b/7/71/
PREPARE REMOVEFILE a/b/7/7text0
PREPARE REMOVEFILE a/b/7/7text1
PREPARE REMOVEDIR a/b/7/
PREPARE REMOVEDIR a/b/6/
PREPARE REMOVEFILE a/b/5/5text1
@ -160,8 +158,6 @@ EXECUTE REMOVEFILE a/b/7/71/7xtest.exe
EXECUTE REMOVEFILE a/b/7/71/7xtext0
EXECUTE REMOVEFILE a/b/7/71/7xtext1
EXECUTE REMOVEDIR a/b/7/71/
EXECUTE REMOVEFILE a/b/7/7text0
EXECUTE REMOVEFILE a/b/7/7text1
EXECUTE REMOVEDIR a/b/7/
EXECUTE REMOVEDIR a/b/6/
EXECUTE REMOVEFILE a/b/5/5text1
@ -220,9 +216,9 @@ FINISH REMOVEDIR a/b/9/94/
directory no longer exists; skipping
FINISH REMOVEDIR a/b/9/93/
FINISH REMOVEDIR a/b/9/92/
a/b/9/92/, rv: 0
removing directory: a/b/9/92/, rv: 0
FINISH REMOVEDIR a/b/9/91/
a/b/9/91/, rv: 0
removing directory: a/b/9/91/, rv: 0
FINISH REMOVEDIR a/b/9/90/
FINISH REMOVEDIR a/b/9/90/
directory no longer exists; skipping
@ -248,9 +244,9 @@ FINISH REMOVEDIR a/b/8/84/
directory no longer exists; skipping
FINISH REMOVEDIR a/b/8/83/
FINISH REMOVEDIR a/b/8/82/
a/b/8/82/, rv: 0
removing directory: a/b/8/82/, rv: 0
FINISH REMOVEDIR a/b/8/81/
a/b/8/81/, rv: 0
removing directory: a/b/8/81/, rv: 0
FINISH REMOVEDIR a/b/8/80/
FINISH REMOVEDIR a/b/8/80/
directory no longer exists; skipping
@ -262,8 +258,6 @@ FINISH REMOVEFILE a/b/7/71/7xtest.exe
FINISH REMOVEFILE a/b/7/71/7xtext0
FINISH REMOVEFILE a/b/7/71/7xtext1
FINISH REMOVEDIR a/b/7/71/
FINISH REMOVEFILE a/b/7/7text0
FINISH REMOVEFILE a/b/7/7text1
FINISH REMOVEDIR a/b/7/
FINISH REMOVEDIR a/b/6/
FINISH REMOVEFILE a/b/5/5text1

8
toolkit/mozapps/update/test/unit/head_update.js.in
Просмотреть файл

@ -673,12 +673,16 @@ function checkUpdateLogContents(aCompareLogFile) {
// Replace error codes since they are different on each platform.
updateLogContents = updateLogContents.replace(/, err:.*\n/g, "\n");
// Replace to make the log parsing happy.
updateLogContents = updateLogContents.replace(/non-fatal error removing directory: /g, "");
updateLogContents = updateLogContents.replace(/non-fatal error /g, "");
// The FindFile results when enumerating the filesystem on Windows is not
// determistic so the results matching the following need to be ignored.
updateLogContents = updateLogContents.replace(/.* a\/b\/7\/7text.*\n/g, "");
let compareLog = do_get_file(aCompareLogFile);
let compareLogContents = readFileBytes(compareLog);
do_check_eq(updateLogContents, compareLogContents);
do_check_eq(compareLogContents, updateLogContents);
}
function checkUpdateLogContains(aCheckString) {