diff --git a/browser/base/content/test/general/browser.ini b/browser/base/content/test/general/browser.ini index e6a2923c3d1e..b059746c81b6 100644 --- a/browser/base/content/test/general/browser.ini +++ b/browser/base/content/test/general/browser.ini @@ -426,10 +426,8 @@ skip-if = buildapp == 'mulet' || e10s # Bug 921935 - focusmanager issues with e1 skip-if = e10s # Bug 1100700 - test relies on unload event firing on closed tabs, which it doesn't [browser_urlHighlight.js] [browser_urlbarAutoFillTrimURLs.js] -skip-if = e10s # Bug 1093941 - Waits indefinitely for onSearchComplete [browser_urlbarCopying.js] [browser_urlbarEnter.js] -skip-if = e10s # Bug 1093941 - used to cause obscure non-windows child process crashes on try [browser_urlbarEnterAfterMouseOver.js] skip-if = os == "linux" || e10s # Bug 1073339 - Investigate autocomplete test unreliability on Linux/e10s [browser_urlbarRevert.js] diff --git a/browser/base/content/test/general/browser_urlbarEnter.js b/browser/base/content/test/general/browser_urlbarEnter.js index 3844813594bd..1717223a8f27 100644 --- a/browser/base/content/test/general/browser_urlbarEnter.js +++ b/browser/base/content/test/general/browser_urlbarEnter.js @@ -25,10 +25,15 @@ add_task(function* () { add_task(function* () { info("Alt+Return keypress"); let tab = gBrowser.selectedTab = gBrowser.addTab(START_VALUE); + // due to bug 691608, we must wait for the load event, else isTabEmpty() will + // return true on e10s for this tab, so it will be reused even with altKey. + yield BrowserTestUtils.browserLoaded(tab.linkedBrowser); gURLBar.focus(); EventUtils.synthesizeKey("VK_RETURN", {altKey: true}); - yield BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser); + + // wait for the new tab to appear. + yield BrowserTestUtils.waitForEvent(gBrowser.tabContainer, "TabOpen"); // Check url bar and selected tab. is(gURLBar.textValue, TEST_VALUE, "Urlbar should preserve the value on return keypress");