Bug 1496191 - When test_big_icon is listening for search engine modifications, ensure it QIs the engine to have the proper interface information. r=mikedeboer
authorMark Banner <standard8@mozilla.com>
Wed, 03 Apr 2019 09:17:40 +0000
changeset 467733 abf4f3d3b075d1af90654f9f665e2b52455ff46d
parent 467732 362eb37eb09f31f236a0cd557b7da997518c5396
child 467734 88c2a60599669ee7899764812730b90ce98a1450
push id35810
push useraciure@mozilla.com
push dateThu, 04 Apr 2019 04:33:36 +0000
treeherdermozilla-central@b72c02e34261 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmikedeboer
bugs1496191
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1496191 - When test_big_icon is listening for search engine modifications, ensure it QIs the engine to have the proper interface information. r=mikedeboer Differential Revision: https://phabricator.services.mozilla.com/D25900
toolkit/components/search/tests/xpcshell/test_big_icon.js
toolkit/components/search/tests/xpcshell/xpcshell.ini
--- a/toolkit/components/search/tests/xpcshell/test_big_icon.js
+++ b/toolkit/components/search/tests/xpcshell/test_big_icon.js
@@ -4,17 +4,20 @@
 "use strict";
 
 add_task(async function test_big_icon() {
   let srv = useHttpServer();
   srv.registerContentType("ico", "image/x-icon");
   await asyncInit();
 
   let promiseChanged = TestUtils.topicObserved("browser-search-engine-modified",
-    (engine, verb) => verb == "engine-changed" && engine.name == "BigIcon" && engine.iconURI);
+    (engine, verb) => {
+      engine.QueryInterface(Ci.nsISearchEngine);
+      return verb == "engine-changed" && engine.name == "BigIcon" && engine.iconURI;
+    });
 
   let iconUrl = gDataUrl + "big_icon.ico";
   await addTestEngines([
     { name: "BigIcon",
       details: [iconUrl, "", "Big icon", "GET",
                 "http://test_big_icon/search?q={searchTerms}"] },
   ]);
 
--- a/toolkit/components/search/tests/xpcshell/xpcshell.ini
+++ b/toolkit/components/search/tests/xpcshell/xpcshell.ini
@@ -26,17 +26,16 @@ support-files =
   data/install.rdf
   data/list.json
   data/search.json
   data/searchSuggestions.sjs
   data/searchTest.jar
 
 [test_nocache.js]
 [test_big_icon.js]
-skip-if = (os == "win" && processor == "x86_64" && !debug) # Bug 1496191
 [test_bug930456.js]
 [test_bug930456_child.js]
 [test_engine_set_alias.js]
 [test_hasEngineWithURL.js]
 [test_identifiers.js]
 [test_ignorelist.js]
 [test_invalid_engine_from_dir.js]
 [test_init_async_multiple.js]