From b46a005045f3153b7f0e2d9467a9a7de2f092e8a Mon Sep 17 00:00:00 2001 From: Robert Strong Date: Tue, 19 Apr 2011 11:03:57 -0700 Subject: [PATCH] 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 --- .../test/unit/data/complete_cc_log_success | 34 ++++++++----------- .../test/unit/data/complete_log_success | 34 ++++++++----------- .../update/test/unit/data/partial_log_failure | 6 ---- .../update/test/unit/data/partial_log_success | 14 +++----- .../update/test/unit/head_update.js.in | 8 +++-- 5 files changed, 38 insertions(+), 58 deletions(-) diff --git a/toolkit/mozapps/update/test/unit/data/complete_cc_log_success b/toolkit/mozapps/update/test/unit/data/complete_cc_log_success index 30ddf209dd3c..5345b914b917 100644 --- a/toolkit/mozapps/update/test/unit/data/complete_cc_log_success +++ b/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 diff --git a/toolkit/mozapps/update/test/unit/data/complete_log_success b/toolkit/mozapps/update/test/unit/data/complete_log_success index c5baa2f7bcea..d70e704eebfd 100644 --- a/toolkit/mozapps/update/test/unit/data/complete_log_success +++ b/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 diff --git a/toolkit/mozapps/update/test/unit/data/partial_log_failure b/toolkit/mozapps/update/test/unit/data/partial_log_failure index 42e60ef422af..b63504c73b80 100644 --- a/toolkit/mozapps/update/test/unit/data/partial_log_failure +++ b/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 diff --git a/toolkit/mozapps/update/test/unit/data/partial_log_success b/toolkit/mozapps/update/test/unit/data/partial_log_success index fd7aed808127..8dbf02413882 100644 --- a/toolkit/mozapps/update/test/unit/data/partial_log_success +++ b/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 diff --git a/toolkit/mozapps/update/test/unit/head_update.js.in b/toolkit/mozapps/update/test/unit/head_update.js.in index 725ed20cceab..e440b2495d1f 100644 --- a/toolkit/mozapps/update/test/unit/head_update.js.in +++ b/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) {