wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1231784 - Fix toolkit/mozapps/update/chrome tests, r=rstrong

Browse Source 
MozReview-Commit-ID: GdkkHzxrjAh
This commit is contained in:
Andrew Halberstadt 2016-01-27 11:36:16 -05:00
parent 8fa1fe045f
commit dc80535fa1
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
testing/mochitest/install.rdf
View File

@ -12,7 +12,8 @@
<Description> <Description>
<em:id>toolkit@mozilla.org</em:id> <em:id>toolkit@mozilla.org</em:id>
#expand <em:minVersion>__MOZILLA_VERSION_U__</em:minVersion> #expand <em:minVersion>__MOZILLA_VERSION_U__</em:minVersion>
#expand <em:maxVersion>__MOZILLA_VERSION_U__</em:maxVersion> <!-- Set to * so toolkit/mozapps/update/chrome tests pass. -->
<em:maxVersion>*</em:maxVersion>
</Description> </Description>
</em:targetApplication> </em:targetApplication>
<!-- Front End MetaData --> <!-- Front End MetaData -->

7
toolkit/mozapps/update/tests/chrome/utils.js
View File

@ -1295,17 +1295,18 @@ function setupAddons(aCallback) {
// tests. // tests.
AddonManager.getAllAddons(function(aAddons) { AddonManager.getAllAddons(function(aAddons) {
let disabledAddons = []; let disabledAddons = [];
let harnessAddons = ["special-powers@mozilla.org", "mochikit@mozilla.org"];
aAddons.forEach(function(aAddon) { aAddons.forEach(function(aAddon) {
// If an addon's type equals plugin it is skipped since // If an addon's type equals plugin it is skipped since
// checking plugins compatibility information isn't supported at this // checking plugins compatibility information isn't supported at this
// time (also see bug 566787). Also, SCOPE_APPLICATION add-ons are // time (also see bug 566787). Also, SCOPE_APPLICATION add-ons are
// excluded by app update so there is no reason to disable them. // excluded by app update so there is no reason to disable them.
// Specialpowers is excluded as the test harness requires it to run // Specialpowers and mochikit are excluded as the test harness requires
// the tests. // them to run the tests.
if (aAddon.type != "plugin" && !aAddon.appDisabled && if (aAddon.type != "plugin" && !aAddon.appDisabled &&
!aAddon.userDisabled && !aAddon.userDisabled &&
aAddon.scope != AddonManager.SCOPE_APPLICATION && aAddon.scope != AddonManager.SCOPE_APPLICATION &&
aAddon.id != "special-powers@mozilla.org") { harnessAddons.indexOf(aAddon.id) == -1) {
disabledAddons.push(aAddon); disabledAddons.push(aAddon);
aAddon.userDisabled = true; aAddon.userDisabled = true;
} }