Bug 1167915 - followup: avoid modal dialog potentially blocking the test. r=ttaubert

browser/components/places/tests/browser/browser_bookmarkProperties_addKeywordForThisSearch.js

@@ -10,9 +10,7 @@ add_task(function* () {
     // We must wait for the context menu code to build metadata.
     yield openContextMenuForContentSelector(browser, 'form > input[name="search"]');
 
-    yield withBookmarksDialog(function*() {
-      AddKeywordForSearchField();
-    }, function* (dialogWin) {
+    yield withBookmarksDialog(AddKeywordForSearchField, function* (dialogWin) {
       let acceptBtn = dialogWin.document.documentElement.getButton("accept");
       ok(acceptBtn.disabled, "Accept button is disabled");
 

browser/components/places/tests/browser/head.js

@@ -310,7 +310,9 @@ let withBookmarksDialog = Task.async(function* (openFn, taskFn) {
   });
 
   info("withBookmarksDialog: opening the dialog");
-  yield openFn();
+  // The dialog might be modal and could block our events loop, so executeSoon.
+  executeSoon(openFn);
+
   info("withBookmarksDialog: waiting for the dialog");
   let dialogWin = yield dialogPromise;