519727 - test_bug430120.js fails on OS X Universal builds

Status: RESOLVED FIXED

(Toolkit :: Add-ons Manager, defect)

Description

[(not currently active) Ted Mielczarek]

It looks like the XULAppInfo in this test isn't getting registered for some reason:

TEST-UNEXPECTED-FAIL | /builds/moz2_slave/mozilla-central-macosx-opt-unittest-everythingelse/build/xpcshell/tests/test_extensionmanager/unit/test_bug430120.js | test failed (with xpcshell return code: 0), see following log:
  >>>>>>>
  TEST-INFO | (xpcshell/head.js) | test 1 pending
TEST-PASS | /builds/moz2_slave/mozilla-central-macosx-opt-unittest-everythingelse/build/xpcshell/tests/test_extensionmanager/unit/test_bug430120.js | [run_test : 141] true == true
TEST-INFO | (xpcshell/head.js) | test 2 pending
*** Blocklist::_loadBlocklistFromFile: blocklist is disabled
TEST-INFO | (xpcshell/head.js) | test 2 finished
TEST-INFO | (xpcshell/head.js) | running event loop
TEST-UNEXPECTED-FAIL | /builds/moz2_slave/mozilla-central-macosx-opt-unittest-everythingelse/build/xpcshell/tests/test_extensionmanager/unit/test_bug430120.js | [e-mail]&1&XPCShell&1&2007010101&XPCShell_Universal-gcc3&locale&updatechannel&Darwin%209.2.0&1.9&distribution&distribution-version == [e-mail]&1&XPCShell&1&2007010101&XPCShell_noarch-spidermonkey&locale&updatechannel&Darwin%209.2.0&1.9&distribution&distribution-version - See following stack:
JS frame :: /builds/moz2_slave/mozilla-central-macosx-opt-unittest-everythingelse/build/xpcshell/head.js :: do_throw :: line 197
JS frame :: /builds/moz2_slave/mozilla-central-macosx-opt-unittest-everythingelse/build/xpcshell/head.js :: do_check_eq :: line 227
JS frame :: /builds/moz2_slave/mozilla-central-macosx-opt-unittest-everythingelse/build/xpcshell/tests/test_extensionmanager/unit/test_bug430120.js :: pathHandler :: line 104
JS frame :: /builds/moz2_slave/mozilla-central-macosx-opt-unittest-everythingelse/build/Minefield.app/Contents/MacOS/components/httpd.js :: anonymous :: line 2160
JS frame :: /builds/moz2_slave/mozilla-central-macosx-opt-unittest-everythingelse/build/Minefield.app/Contents/MacOS/components/httpd.js :: anonymous :: line 1085

Comment 1

[(not currently active) Ted Mielczarek]

Note that this is a universal build + a universal test package, so everything including xpcshell is a universal binary.

Comment 2

[(not currently active) Ted Mielczarek]

Attachment: add universal binary special casing to the test

Mossop points out the ifdef here which is clearly the culprit:
http://mxr.mozilla.org/mozilla-central/source/toolkit/mozapps/extensions/src/nsBlocklistService.js#353

This patch adds the same special casing to the test, and makes it pass for me.

Comment 3

[(not currently active) Ted Mielczarek]

Pushed to m-c:
http://hg.mozilla.org/mozilla-central/rev/5a14cf31b53e

Comment 4

[(not currently active) Ted Mielczarek]

Pushed to 1.9.2:
http://hg.mozilla.org/releases/mozilla-1.9.2/rev/9c310984f2b2