486275 - active-update.xml is not saved after a channel change which leaves behind cruft

Status: RESOLVED FIXED

(Toolkit :: Application Update, defect)

Description

[Robert Strong (they/them - no direct email)]

Found while working on bug 485624

Comment 1

[Robert Strong (they/them - no direct email)]

Attachment: patch w/ tests rev1 (requires patches from bug 485624)

Comment 2

[Robert Strong (they/them - no direct email)]

Comment on attachment 370371 [details] [diff] [review]
patch w/ tests rev1 (requires patches from bug 485624)

>diff --git a/toolkit/mozapps/update/test/unit/test_0063_Manager_local_xml.js b/toolkit/mozapps/update/test/unit/test_0063_Manager_local_xml.js
>new file mode 100644
>--- /dev/null
>+++ b/toolkit/mozapps/update/test/unit/test_0063_Manager_local_xml.js

Please consider these fixed in my repo
>+  dump("Testing: verifying contents of " + FILE_UPDATE_ACTIVE "\n");
should be
>+  dump("Testing: verifying contents of " + FILE_UPDATE_ACTIVE + "\n");
and
>+  dump("Testing: verifying contents of " + FILE_UPDATES_DB "\n");
should be
should be
>+  dump("Testing: verifying contents of " + FILE_UPDATES_DB + "\n");

Comment 3

[Robert Strong (they/them - no direct email)]

Attachment: patch w/ tests rev2 (requires patches from bug 485624)

Comment 4

[Robert Strong (they/them - no direct email)]

Comment on attachment 370373 [details] [diff] [review]
patch w/ tests rev2 (requires patches from bug 485624)

bah... this also existing overwrites the update history.

Comment 5

[Robert Strong (they/them - no direct email)]

Attachment: patch w/ tests rev3 (requires patches from bug 487346)

this should do it

Comment 6

[Robert Strong (they/them - no direct email)]

Comment on attachment 370376 [details] [diff] [review]
patch w/ tests rev3 (requires patches from bug 487346)

>--- a/toolkit/mozapps/update/test/unit/head_update.js
>+++ b/toolkit/mozapps/update/test/unit/head_update.js
>...
>@@ -402,6 +402,31 @@ function closeSafeOutputStream(fos) {
>     fos.close();
> }
> 
>+function readUpdateXMLFile(fileName) {
>+  var fileLocator = AUS_Cc["@mozilla.org/file/directory_service;1"]
>+                      .getService(AUS_Ci.nsIProperties);
>+  var dir = fileLocator.get("GreD", AUS_Ci.nsIFile);
>+
>+  var file = dir.clone();
The above 3 vars are replaced by the following with the changes I've made in bug 487346
  var file = gNewGreD.clone();

>+function readFile(file) {
>+  var fis = AUS_Cc["@mozilla.org/network/file-input-stream;1"]
>+              .createInstance(AUS_Ci.nsIFileInputStream);
>+  var modeFlags = MODE_RDONLY;
>+  if (!file.exists())
>+    return null;
>+  fis.init(file, modeFlags, PERMS_FILE, 0);
I changed this to just use MODE_RDONLY instead of the var

Other than that it is good to go

Comment 7

[Robert Strong (they/them - no direct email)]

Attachment: patch rev4 remove bitrot - requires the patch from bug 487346

Comment 8

[Robert Strong (they/them - no direct email)]

Attachment: patch rev4 remove bitrot - requires the patch from bug 487346

missed a file :(

Comment 9

[Robert Strong (they/them - no direct email)]

Attachment: patch rev5 remove bitrot again

Comment 10

[Robert Strong (they/them - no direct email)]

Attachment: patch rev6 remove bitrot - requires patch from bug 488797

gonna hold off on requesting review until after bug 488797 is fixed

Comment 11

[Robert Strong (they/them - no direct email)]

Attachment: patch rev7 - remove bitrot

Comment 12

[Robert Strong (they/them - no direct email)]

Pushed to mozilla-central
http://hg.mozilla.org/mozilla-central/rev/371be45fedd1

Comment 13

[Robert Strong (they/them - no direct email)]

Attachment: patch as checked in (requires patch from bug 493805)