Commit 0c1de4f2 authored by hichris123's avatar hichris123 Committed by Commit bot

Re-enable some OmniboxViewTests on Windows

Currently, PopupAccelerators and BasicTextOperations are disabled on Windows due to flakiness & timing out. This CL enables them again.

BUG=146619, 69941

Review URL: https://codereview.chromium.org/930453002

Cr-Commit-Position: refs/heads/master@{#316356}
parent 83c3d4a8
...@@ -438,9 +438,8 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_BrowserAccelerators) { ...@@ -438,9 +438,8 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_BrowserAccelerators) {
#endif #endif
} }
// Flakily fails and times out on Win only. http://crbug.com/69941
// Fails on Linux. http://crbug.com/408634 // Fails on Linux. http://crbug.com/408634
#if defined(OS_WIN) || defined(OS_LINUX) #if defined(OS_LINUX)
#define MAYBE_PopupAccelerators DISABLED_PopupAccelerators #define MAYBE_PopupAccelerators DISABLED_PopupAccelerators
#else #else
#define MAYBE_PopupAccelerators PopupAccelerators #define MAYBE_PopupAccelerators PopupAccelerators
...@@ -800,14 +799,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, EscapeToDefaultMatch) { ...@@ -800,14 +799,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, EscapeToDefaultMatch) {
EXPECT_EQ(old_selected_line, popup_model->selected_line()); EXPECT_EQ(old_selected_line, popup_model->selected_line());
} }
// Flaky on Windows: http://crbug.com/146619 IN_PROC_BROWSER_TEST_F(OmniboxViewTest, BasicTextOperations) {
#if defined(OS_WIN)
#define MAYBE_BasicTextOperations DISABLED_BasicTextOperations
#else
#define MAYBE_BasicTextOperations BasicTextOperations
#endif
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_BasicTextOperations) {
ui_test_utils::NavigateToURL(browser(), GURL(url::kAboutBlankURL)); ui_test_utils::NavigateToURL(browser(), GURL(url::kAboutBlankURL));
chrome::FocusLocationBar(browser()); chrome::FocusLocationBar(browser());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment