diff -r 000000000000 -r 6474c204b198 toolkit/mozapps/update/tests/unit_aus_update/cleanupDownloadingForDifferentChannel.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/toolkit/mozapps/update/tests/unit_aus_update/cleanupDownloadingForDifferentChannel.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,44 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+/* General Update Manager Tests */
+
+function run_test() {
+  setupTestCommon();
+
+  logTestInfo("testing removal of an active update for a channel that is not" +
+              "valid due to switching channels (Bug 486275).");
+
+  var patches, updates, update;
+  patches = getLocalPatchString(null, null, null, null, null, null,
+                                STATE_DOWNLOADING);
+  updates = getLocalUpdateString(patches, null, null, "version 1.0", "1.0");
+  writeUpdatesToXMLFile(getLocalUpdatesXMLString(updates), true);
+  writeStatusFile(STATE_DOWNLOADING);
+
+  patches = getLocalPatchString(null, null, null, null, null, null,
+                                STATE_FAILED);
+  updates = getLocalUpdateString(patches, null, "Existing", "version 3.0",
+                                 "3.0", "3.0", null, null, null, null, null,
+                                 getString("patchApplyFailure"));
+  writeUpdatesToXMLFile(getLocalUpdatesXMLString(updates), false);
+
+  setUpdateChannel("original_channel");
+
+  standardInit();
+
+  do_check_eq(gUpdateManager.updateCount, 1);
+  update = gUpdateManager.getUpdateAt(0);
+  do_check_eq(update.name, "Existing");
+
+  do_check_eq(gUpdateManager.activeUpdate, null);
+  // Verify that the active-update.xml file has had the update from the old
+  // channel removed.
+  file = getUpdatesXMLFile(true);
+  logTestInfo("verifying contents of " + FILE_UPDATE_ACTIVE);
+  do_check_eq(readFile(file), getLocalUpdatesXMLString(""));
+
+  doTestFinish();
+}