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, a=test-only
authorMark Banner <standard8@mozilla.com>
Wed, 03 Apr 2019 09:17:40 +0000
changeset 525941 dc1994aefb3dfc3e974604f1bef424d7067ad24b
parent 525940 94dc8b2e7cb90e47a172823b3b5f94a0595a35a2
child 525942 146e15a24ea12ce80060d2fac13aad0f19dbfde0
push id2032
push userffxbld-merge
push dateMon, 13 May 2019 09:36:57 +0000
treeherdermozilla-release@455c1065dcbe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmikedeboer, test-only
bugs1496191
milestone67.0
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, a=test-only 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]