1756386 - Use `AddonTestUtils.loadBlocklistRawData` in test_update.js

Status: RESOLVED FIXED

(Toolkit :: Add-ons Manager, task, P3)

Description

[Mathew Hodson]

In https://phabricator.services.mozilla.com/D134220#inline-741488, @robwu wrote:

This MockBlocklist and overrideBlocklist is used by only one unit test. I don't like the lot of test-only code + exports to support just this one test.

• The AddonTestUtils.overrideBlocklist method is not necessary, since we already have the AddonTestUtils.loadBlocklistRawData method. More on that below.
• The test here has two cases with blocklistState set: https://searchfox.org/mozilla-central/rev/83ef0d3b5678b8ec3ae4fa81c9a9e43998f77d77/toolkit/mozapps/extensions/test/xpcshell/test_update.js#541-587, one for STATE_SOFTBLOCKED and another for STATE_BLOCKED. STATE_BLOCKED is no longer supported in practice, but if you'd like you can force the old blocklist implementation to be enabled and mark an add-on as soft-blocked using the snippets from https://searchfox.org/mozilla-central/rev/d5f5d8749740dabf26cb87e2b48f2ae0ce253df4/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_softblocked.js#5-6,36-47.
  Since STATE_SOFTBLOCKED is unsupported, I would just remove the case for that: https://searchfox.org/mozilla-central/rev/83ef0d3b5678b8ec3ae4fa81c9a9e43998f77d77/toolkit/mozapps/extensions/test/xpcshell/test_update.js#541-564
• Here is an example of the recommended way to mark an add-on as blocklisted in a test: https://searchfox.org/mozilla-central/rev/d5f5d8749740dabf26cb87e2b48f2ae0ce253df4/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_statechange_telemetry.js#121-126

Comment 1

[Mathew Hodson]

Attachment: Bug 1756386 - Use `AddonTestUtils.loadBlocklistRawData` in test_update.js. r?robwu

Remove unneeded test code and unsupported STATE_SOFTBLOCKED case.

Comment 2

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/44b3dbd64f74
Use `AddonTestUtils.loadBlocklistRawData` in test_update.js. r=robwu

Comment 3

[Cristina Cozmuta (:CrissCozmuta)]

https://hg.mozilla.org/mozilla-central/rev/44b3dbd64f74