Closed Bug 1766087 Opened 2 years ago Closed 2 years ago

Clean up test_blocklistchange.js and test/xpcshell/data/blocklistchange/

Categories

(Toolkit :: Blocklist Implementation, task, P1)

task

Tracking

()

RESOLVED FIXED
102 Branch
Tracking Status
firefox102 --- fixed

People

(Reporter: robwu, Assigned: robwu)

References

Details

Attachments

(2 files)

toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/ contains several XML files that were only used in XML-based blocklist. Which has been removed a long time ago.

test_blocklistchange.js also contains "softblock5" in the blocklists in the test, which are not matching any addon in the test. There was a reference to "softblock5" in the XML-based tests on which test_blocklistchange.js is based, but not in test_blocklistchange.js itself. So these references can be removed too.

The addon_update1.json, addon_update2.json and addon_update3.json files in the test directory have dummy values for the version fields. The tests themselves define the version as something dot zero, but every file lists a version without a .0 (e.g. "version": "2" in addon_update1.json).

Further, addon_update3.json references version 4 in the update manifest, but the XPIs it points to are actually version 1.0 (source).

The "succesful" update part of the test referenced a XPI where the
version differed from the update manifest. This is not supported,
the update manifest's version should match the version from the XPI.

As noted in the bug, addon_update1.json and addon_update2.json also
specify incorrect versions, but as the XPIs are not actually fetched
that doesn't matter in the test.
(I will address that in the next patch.)

blocklistchange/addon_update*.json contained incorrect values in
"version". There is a pattern in the way that these tests are
constructed, so test_blocklistchange.json was updated to generate the
update manifests, along with extra comments that explain the relation
between the various test files.

With this change, blocklistchange/ has become fully obsolete and has
been removed from the test.

As noted in the bug, "softblock5" is not used anywhere, so its
references have been removed too.

Severity: -- → N/A
Priority: -- → P1
Pushed by rob@robwu.nl:
https://hg.mozilla.org/integration/autoland/rev/d17f69e5fda2
Fix test_blocklistchange.js to use correct versions r=Gijs
https://hg.mozilla.org/integration/autoland/rev/b8f9005aa268
Clean up test_blocklistchange.js r=Gijs
Status: ASSIGNED → RESOLVED
Closed: 2 years ago
Resolution: --- → FIXED
Target Milestone: --- → 102 Branch
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Created:
Updated:
Size: