698524 - test_startup.js xpcshell test fails for SeaMonkey due to Modern theme default add-on not being excluded

Status: RESOLVED FIXED

(Toolkit :: Add-ons Manager, defect)

Description

[Jens Hatlak (:InvisibleSmiley)]

Attachment: patch

Mossop said in bug 696598 comment 7:

(In reply to Jens Hatlak (:InvisibleSmiley) from comment #6)
> (In reply to Ian Neal from comment #5)
> > I presume with this patch that we now pass the relevant tests from
> > toolkit/mozapps/extensions/test/xpcshell that were introduced by bug 693743 ?
> 
> No. test_startup.js still fails through its dependency head_addons.js which
> fails with:
> 
> TEST-UNEXPECTED-FAIL |
> /path/to/my/mozilla/seamonkey-central/mozilla/_tests/xpcshell/toolkit/
> mozapps/extensions/test/xpcshell/head_addons.js | [] ==
> ["[e-mail]"] - See following stack:
> JS frame :: /path/to/my/comm-central/mozilla/testing/xpcshell/head.js ::
> do_throw :: line 453
> JS frame :: /path/to/my/comm-central/mozilla/testing/xpcshell/head.js ::
> _do_check_eq :: line 547
> JS frame :: /path/to/my/comm-central/mozilla/testing/xpcshell/head.js ::
> do_check_eq :: line 568
> JS frame ::
> /path/to/my/mozilla/seamonkey-central/mozilla/_tests/xpcshell/toolkit/
> mozapps/extensions/test/xpcshell/head_addons.js :: check_startup_changes ::
> line 454
> 
> which is probably because the test only excludes the default theme (which
> happens to have the same ID for both FF and SM) in check_startup_changes on
> line 450 but not Modern. I guess that can only be fixed in the test itself,
> but I'm not sure whether adding yet another static value is exactly the
> right way to go there... Probably easiest, though (if accepted). Dave, what
> would be my chances there if I filed a bug?

I think the right thing there is to filter out any add-ons with IDs that don't end with "@tests.mozilla.org".

Comment 1

[Jens Hatlak (:InvisibleSmiley)]

Comment on attachment 570775 [details] [diff] [review]
patch

Can someone please drive this in for me? I haven't tested this with FF yet and I'm not up-to-date regarding requirements/procedure for landing on m-c (try, inbound etc.).

Comment 2

[Ed Morley [:emorley]]

I've sent to try for you:
https://tbpl.mozilla.org/?tree=Try&rev=935025e59d2e

In the meantime, could you reply with a commit message that summarises the change made, to save me having to be creative. Thanks :-)

Comment 3

[Jens Hatlak (:InvisibleSmiley)]

(In reply to Ed Morley [:edmorley] from comment #2)
> I've sent to try for you:
> https://tbpl.mozilla.org/?tree=Try&rev=935025e59d2e

TUVM!

> In the meantime, could you reply with a commit message that summarises the
> change made, to save me having to be creative. Thanks :-)

How about "Bug 698524 - fix test_startup.js xpcshell test for SeaMonkey by excluding all non-test add-ons. r=Mossop"?

Comment 4

[Ed Morley [:emorley]]

Comment on attachment 570775 [details] [diff] [review]
patch

Sounds good, pushed :-)

https://hg.mozilla.org/integration/mozilla-inbound/rev/6fd950c6f0b9

Comment 5

[Marco Bonardo [:mak]]

https://hg.mozilla.org/mozilla-central/rev/6fd950c6f0b9