6. test fix to make log parsing happy - Bug 386760 - directory removal with software update. r=testfix
authorRobert Strong <robert.bugzilla@gmail.com>
Mon, 11 Apr 2011 21:44:03 -0700
changeset 67963 a174b86200d6
parent 67962 b4dcf0feefd1
child 67964 e6d044d30abf
push id19457
push userrstrong@mozilla.com
push dateTue, 12 Apr 2011 04:44:14 +0000
treeherdermozilla-central@a174b86200d6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestfix
bugs6, 386760
milestone2.2a1pre
first release with
nightly linux32
a174b86200d6 / 4.2a1pre / 20110412030535 / files
nightly linux64
a174b86200d6 / 4.2a1pre / 20110412030535 / files
nightly win32
a174b86200d6 / 4.2a1pre / 20110412030535 / files
nightly mac
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly win32
6. test fix to make log parsing happy - Bug 386760 - directory removal with software update. r=testfix
toolkit/mozapps/update/test/unit/data/complete_cc_log_success
toolkit/mozapps/update/test/unit/data/complete_log_success
toolkit/mozapps/update/test/unit/data/partial_log_success
toolkit/mozapps/update/test/unit/head_update.js.in
--- a/toolkit/mozapps/update/test/unit/data/complete_cc_log_success
+++ b/toolkit/mozapps/update/test/unit/data/complete_cc_log_success
@@ -228,37 +228,37 @@ FINISH REMOVEFILE a/b/extensions/extensi
 FINISH REMOVEFILE a/b/extensions/extensions0/extensions0text0
 FINISH REMOVEFILE a/b/exe0.exe
 FINISH REMOVEFILE a/b/defaults/pref/channel-prefs.js
 FINISH REMOVEFILE a/b/2/20/20text0
 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/
-non-fatal error removing directory: a/b/searchplugins/, rv: 0
+a/b/searchplugins/, rv: 0
 FINISH REMOVEDIR a/b/extensions/extensions1/
-non-fatal error removing directory: a/b/extensions/extensions1/, rv: 0
+a/b/extensions/extensions1/, rv: 0
 FINISH REMOVEDIR a/b/extensions/extensions0/
-non-fatal error removing directory: a/b/extensions/extensions0/, rv: 0
+a/b/extensions/extensions0/, rv: 0
 FINISH REMOVEDIR a/b/extensions/
-non-fatal error removing directory: a/b/extensions/, rv: 0
+a/b/extensions/, rv: 0
 FINISH REMOVEDIR a/b/defaults/pref/
-non-fatal error removing directory: a/b/defaults/pref/, rv: 0
+a/b/defaults/pref/, rv: 0
 FINISH REMOVEDIR a/b/defaults/
-non-fatal error removing directory: a/b/defaults/, rv: 0
+a/b/defaults/, rv: 0
 FINISH REMOVEDIR a/b/2/20/
 FINISH REMOVEDIR a/b/2/
 FINISH REMOVEDIR a/b/0/00/
-non-fatal error removing directory: a/b/0/00/, rv: 0
+a/b/0/00/, rv: 0
 FINISH REMOVEDIR a/b/0/
-non-fatal error removing directory: a/b/0/, rv: 0
+a/b/0/, rv: 0
 FINISH REMOVEDIR a/b/
-non-fatal error removing directory: a/b/, rv: 0
+a/b/, rv: 0
 FINISH REMOVEDIR a/
-non-fatal error removing directory: a/, rv: 0
+a/, rv: 0
 FINISH ADD a/b/defaults/pref/channel-prefs.js
 FINISH ADD precomplete
 FINISH ADD a/b/searchplugins/searchpluginstext0
 FINISH ADD a/b/searchplugins/searchpluginspng1.png
 FINISH ADD a/b/searchplugins/searchpluginspng0.png
 FINISH ADD a/b/removed-files
 FINISH ADD a/b/extensions/extensions1/extensions1text0
 FINISH ADD a/b/extensions/extensions1/extensions1png1.png
@@ -289,19 +289,19 @@ FINISH REMOVEDIR a/b/9/96/
 FINISH REMOVEDIR a/b/9/95/
 FINISH REMOVEDIR a/b/9/95/
 directory no longer exists; skipping
 FINISH REMOVEDIR a/b/9/94/
 FINISH REMOVEDIR a/b/9/94/
 directory no longer exists; skipping
 FINISH REMOVEDIR a/b/9/93/
 FINISH REMOVEDIR a/b/9/92/
-non-fatal error removing directory: a/b/9/92/, rv: 0
+a/b/9/92/, rv: 0
 FINISH REMOVEDIR a/b/9/91/
-non-fatal error removing directory: a/b/9/91/, rv: 0
+a/b/9/91/, rv: 0
 FINISH REMOVEDIR a/b/9/90/
 FINISH REMOVEDIR a/b/9/90/
 directory no longer exists; skipping
 FINISH REMOVEDIR a/b/8/89/
 FINISH REMOVEDIR a/b/8/89/
 directory no longer exists; skipping
 FINISH REMOVEDIR a/b/8/88/
 FINISH REMOVEFILE a/b/8/87/870/87xtext0
@@ -317,19 +317,19 @@ FINISH REMOVEDIR a/b/8/86/
 FINISH REMOVEDIR a/b/8/85/
 FINISH REMOVEDIR a/b/8/85/
 directory no longer exists; skipping
 FINISH REMOVEDIR a/b/8/84/
 FINISH REMOVEDIR a/b/8/84/
 directory no longer exists; skipping
 FINISH REMOVEDIR a/b/8/83/
 FINISH REMOVEDIR a/b/8/82/
-non-fatal error removing directory: a/b/8/82/, rv: 0
+a/b/8/82/, rv: 0
 FINISH REMOVEDIR a/b/8/81/
-non-fatal error removing directory: a/b/8/81/, rv: 0
+a/b/8/81/, rv: 0
 FINISH REMOVEDIR a/b/8/80/
 FINISH REMOVEDIR a/b/8/80/
 directory no longer exists; skipping
 FINISH REMOVEFILE a/b/7/70/7xtest.exe
 FINISH REMOVEFILE a/b/7/70/7xtext0
 FINISH REMOVEFILE a/b/7/70/7xtext1
 FINISH REMOVEDIR a/b/7/70/
 FINISH REMOVEFILE a/b/7/71/7xtest.exe
--- a/toolkit/mozapps/update/test/unit/data/complete_log_success
+++ b/toolkit/mozapps/update/test/unit/data/complete_log_success
@@ -222,37 +222,37 @@ FINISH REMOVEFILE a/b/removed-files
 FINISH REMOVEFILE a/b/extensions/extensions1/extensions1png1.png
 FINISH REMOVEFILE a/b/extensions/extensions0/extensions0text0
 FINISH REMOVEFILE a/b/exe0.exe
 FINISH REMOVEFILE a/b/2/20/20text0
 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/
-non-fatal error removing directory: a/b/searchplugins/, rv: 0
+a/b/searchplugins/, rv: 0
 FINISH REMOVEDIR a/b/extensions/extensions1/
-non-fatal error removing directory: a/b/extensions/extensions1/, rv: 0
+a/b/extensions/extensions1/, rv: 0
 FINISH REMOVEDIR a/b/extensions/extensions0/
-non-fatal error removing directory: a/b/extensions/extensions0/, rv: 0
+a/b/extensions/extensions0/, rv: 0
 FINISH REMOVEDIR a/b/extensions/
-non-fatal error removing directory: a/b/extensions/, rv: 0
+a/b/extensions/, rv: 0
 FINISH REMOVEDIR a/b/defaults/pref/
-non-fatal error removing directory: a/b/defaults/pref/, rv: 0
+a/b/defaults/pref/, rv: 0
 FINISH REMOVEDIR a/b/defaults/
-non-fatal error removing directory: a/b/defaults/, rv: 0
+a/b/defaults/, rv: 0
 FINISH REMOVEDIR a/b/2/20/
 FINISH REMOVEDIR a/b/2/
 FINISH REMOVEDIR a/b/0/00/
-non-fatal error removing directory: a/b/0/00/, rv: 0
+a/b/0/00/, rv: 0
 FINISH REMOVEDIR a/b/0/
-non-fatal error removing directory: a/b/0/, rv: 0
+a/b/0/, rv: 0
 FINISH REMOVEDIR a/b/
-non-fatal error removing directory: a/b/, rv: 0
+a/b/, rv: 0
 FINISH REMOVEDIR a/
-non-fatal error removing directory: a/, rv: 0
+a/, rv: 0
 FINISH ADD precomplete
 FINISH ADD a/b/searchplugins/searchpluginstext0
 FINISH ADD a/b/searchplugins/searchpluginspng1.png
 FINISH ADD a/b/searchplugins/searchpluginspng0.png
 FINISH ADD a/b/removed-files
 FINISH ADD a/b/extensions/extensions1/extensions1text0
 FINISH ADD a/b/extensions/extensions1/extensions1png1.png
 FINISH ADD a/b/extensions/extensions1/extensions1png0.png
@@ -282,19 +282,19 @@ FINISH REMOVEDIR a/b/9/96/
 FINISH REMOVEDIR a/b/9/95/
 FINISH REMOVEDIR a/b/9/95/
 directory no longer exists; skipping
 FINISH REMOVEDIR a/b/9/94/
 FINISH REMOVEDIR a/b/9/94/
 directory no longer exists; skipping
 FINISH REMOVEDIR a/b/9/93/
 FINISH REMOVEDIR a/b/9/92/
-non-fatal error removing directory: a/b/9/92/, rv: 0
+a/b/9/92/, rv: 0
 FINISH REMOVEDIR a/b/9/91/
-non-fatal error removing directory: a/b/9/91/, rv: 0
+a/b/9/91/, rv: 0
 FINISH REMOVEDIR a/b/9/90/
 FINISH REMOVEDIR a/b/9/90/
 directory no longer exists; skipping
 FINISH REMOVEDIR a/b/8/89/
 FINISH REMOVEDIR a/b/8/89/
 directory no longer exists; skipping
 FINISH REMOVEDIR a/b/8/88/
 FINISH REMOVEFILE a/b/8/87/870/87xtext0
@@ -310,19 +310,19 @@ FINISH REMOVEDIR a/b/8/86/
 FINISH REMOVEDIR a/b/8/85/
 FINISH REMOVEDIR a/b/8/85/
 directory no longer exists; skipping
 FINISH REMOVEDIR a/b/8/84/
 FINISH REMOVEDIR a/b/8/84/
 directory no longer exists; skipping
 FINISH REMOVEDIR a/b/8/83/
 FINISH REMOVEDIR a/b/8/82/
-non-fatal error removing directory: a/b/8/82/, rv: 0
+a/b/8/82/, rv: 0
 FINISH REMOVEDIR a/b/8/81/
-non-fatal error removing directory: a/b/8/81/, rv: 0
+a/b/8/81/, rv: 0
 FINISH REMOVEDIR a/b/8/80/
 FINISH REMOVEDIR a/b/8/80/
 directory no longer exists; skipping
 FINISH REMOVEFILE a/b/7/70/7xtest.exe
 FINISH REMOVEFILE a/b/7/70/7xtext0
 FINISH REMOVEFILE a/b/7/70/7xtext1
 FINISH REMOVEDIR a/b/7/70/
 FINISH REMOVEFILE a/b/7/71/7xtest.exe
--- a/toolkit/mozapps/update/test/unit/data/partial_log_success
+++ b/toolkit/mozapps/update/test/unit/data/partial_log_success
@@ -215,19 +215,19 @@ FINISH REMOVEDIR a/b/9/96/
 FINISH REMOVEDIR a/b/9/95/
 FINISH REMOVEDIR a/b/9/95/
 directory no longer exists; skipping
 FINISH REMOVEDIR a/b/9/94/
 FINISH REMOVEDIR a/b/9/94/
 directory no longer exists; skipping
 FINISH REMOVEDIR a/b/9/93/
 FINISH REMOVEDIR a/b/9/92/
-non-fatal error removing directory: a/b/9/92/, rv: 0
+a/b/9/92/, rv: 0
 FINISH REMOVEDIR a/b/9/91/
-non-fatal error removing directory: a/b/9/91/, rv: 0
+a/b/9/91/, rv: 0
 FINISH REMOVEDIR a/b/9/90/
 FINISH REMOVEDIR a/b/9/90/
 directory no longer exists; skipping
 FINISH REMOVEDIR a/b/8/89/
 FINISH REMOVEDIR a/b/8/89/
 directory no longer exists; skipping
 FINISH REMOVEDIR a/b/8/88/
 FINISH REMOVEFILE a/b/8/87/870/87xtext0
@@ -243,19 +243,19 @@ FINISH REMOVEDIR a/b/8/86/
 FINISH REMOVEDIR a/b/8/85/
 FINISH REMOVEDIR a/b/8/85/
 directory no longer exists; skipping
 FINISH REMOVEDIR a/b/8/84/
 FINISH REMOVEDIR a/b/8/84/
 directory no longer exists; skipping
 FINISH REMOVEDIR a/b/8/83/
 FINISH REMOVEDIR a/b/8/82/
-non-fatal error removing directory: a/b/8/82/, rv: 0
+a/b/8/82/, rv: 0
 FINISH REMOVEDIR a/b/8/81/
-non-fatal error removing directory: a/b/8/81/, rv: 0
+a/b/8/81/, rv: 0
 FINISH REMOVEDIR a/b/8/80/
 FINISH REMOVEDIR a/b/8/80/
 directory no longer exists; skipping
 FINISH REMOVEFILE a/b/7/70/7xtest.exe
 FINISH REMOVEFILE a/b/7/70/7xtext0
 FINISH REMOVEFILE a/b/7/70/7xtext1
 FINISH REMOVEDIR a/b/7/70/
 FINISH REMOVEFILE a/b/7/71/7xtest.exe
--- a/toolkit/mozapps/update/test/unit/head_update.js.in
+++ b/toolkit/mozapps/update/test/unit/head_update.js.in
@@ -667,16 +667,18 @@ function checkUpdateLogContents(aCompare
 
   let updateLog = do_get_file(TEST_ID + UPDATES_DIR_SUFFIX, true);
   updateLog.append(FILE_UPDATE_LOG);
   // Skip the first two lines since they contain absolute paths.
   let updateLogContents = readFileBytes(updateLog).split("\n").slice(2).join("\n");
   updateLogContents = updateLogContents.replace(/\r/g, "");
   // 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, "");
 
   let compareLog = do_get_file(aCompareLogFile);
   let compareLogContents = readFileBytes(compareLog);
 
   do_check_eq(updateLogContents, compareLogContents);
 }
 
 function checkUpdateLogContains(aCheckString) {