Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-01 22:07:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1481439 - Fix intermittent browser_ext_omnibox.js r=aswan

Browse Source 
The "startInputSession" test helper triggers the autocompletion logic to
kick off the test. In all cases except for "testSuggestions", the search
suggestions are set synchronously. Consequently, the
"waitForAutocompleteResultAt" call at the end of starting the input
session would find the expected suggestion item at the given index.

However, in the case of "testSuggestions", the results are generated
asynchronously. There is no guarantee that the results are set. The test
has only been passing so far because the result items from the previous
test are still cached, and cleared after a 100ms delay by:
https://searchfox.org/mozilla-central/rev/a41fd8cb947266ea2e3f463fc6e31c88bfab9d41/toolkit/components/places/UnifiedComplete.js#1728
On slow test runs, the test fails intermittently when the clean-up logic
runs before the test checked the suggestion item.

This patch fixes the issue by splitting "startInputSession", and only
use "waitForAutocompleteResultAt" after having sent the suggestions.

Differential Revision: https://phabricator.services.mozilla.com/D5170

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Rob Wu 2018-09-10 20:06:24 +00:00
parent 8397e5b7f1
commit 14f47ddcc3
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
browser/components/extensions/test/browser/browser_ext_omnibox.js
View File

@ -52,6 +52,7 @@ add_task(async function() {
break;
case "set-synchronous":
synchronous = data.synchronous;
browser.test.sendMessage("set-synchronous-set");
break;
case "test-multiple-suggest-calls":
suggestions.forEach(suggestion => suggestCallback([suggestion]));
@ -104,7 +105,7 @@ add_task(async function() {
}
let inputSessionSerial = 0;
async function startInputSession(indexToWaitFor) {
async function startInputSession() {
gURLBar.focus();
gURLBar.value = keyword;
EventUtils.sendString(" ");
@ -115,17 +116,6 @@ add_task(async function() {
EventUtils.sendString(char);
await expectEvent("on-input-changed-fired", {text: char});
// Wait for the autocomplete search. Note that we cannot wait for the search
// to be complete, since the add-on doesn't communicate when it's done, so
// just check matches count.
try {
await waitForAutocompleteResultAt(indexToWaitFor);
} catch (e) {
// Print message for debugging. Discard data:-URIs.
info(gURLBar.popup.richlistbox.outerHTML.replace(/data:image[^"\s]+/g, "data:image..."));
throw e;
}
return char;
}
@ -196,7 +186,8 @@ add_task(async function() {
await extension.awaitMessage("default-suggestion-set");
}
let text = await startInputSession(0);
let text = await startInputSession();
await waitForAutocompleteResultAt(0);
let item = gURLBar.popup.richlistbox.children[0];
@ -215,7 +206,8 @@ add_task(async function() {
}
async function testDisposition(suggestionIndex, expectedDisposition, expectedText) {
await startInputSession(suggestionIndex);
await startInputSession();
await waitForAutocompleteResultAt(suggestionIndex);
// Select the suggestion.
EventUtils.synthesizeKey("KEY_ArrowDown", {repeat: suggestionIndex});
@ -238,6 +230,7 @@ add_task(async function() {
async function testSuggestions(info) {
extension.sendMessage("set-synchronous", {synchronous: false});
await extension.awaitMessage("set-synchronous-set");
function expectSuggestion({content, description}, index) {
let item = gURLBar.popup.richlistbox.children[index + 1]; // Skip the heuristic result.
@ -250,11 +243,15 @@ add_task(async function() {
`Expected suggestion to have displayurl: "${keyword} ${content}".`);
}
let text = await startInputSession(info.suggestions.length - 1);
let text = await startInputSession();
// Even if the results are generated asynchronously,
// the heuristic result should always be present.
await waitForAutocompleteResultAt(0);
extension.sendMessage(info.test);
await extension.awaitMessage("test-ready");
await waitForAutocompleteResultAt(info.suggestions.length - 1);
info.suggestions.forEach(expectSuggestion);
let promiseEvent = expectEvent("on-input-entered-fired", {