Commit 16ac914c authored by Greg Thompson's avatar Greg Thompson Committed by Commit Bot

Revert "Enable interactive_ui_tests on Windows that now run mostly reliably."

This reverts commit e1ccd581.

Reason for revert: Widespread "Check failed: false. Observers can only be added once!" failures.

Original change's description:
> Enable interactive_ui_tests on Windows that now run mostly reliably.
> 
> r516772 was the last of many commits that resolved a number of problems
> that made this test suite flaky on Windows. This CL enables tests that
> had been disabled over time due to flakes, yet now seem to run okay.
> 
> BUG=133341,751031,751543,764415,789913
> This CL was uploaded by git cl split.
> 
> R=​sky@chromium.org
> 
> Change-Id: I753c741a9194f489f072cd86d72407a1294150c3
> Reviewed-on: https://chromium-review.googlesource.com/784937
> Reviewed-by: Scott Violet <sky@chromium.org>
> Commit-Queue: Greg Thompson <grt@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#521416}

TBR=sky@chromium.org,grt@chromium.org

Change-Id: I33b192c628fdfebe9cfd93b71abd3b394faad9e5
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 133341, 751031, 751543, 764415, 789913
Reviewed-on: https://chromium-review.googlesource.com/808204Reviewed-by: default avatarGreg Thompson <grt@chromium.org>
Commit-Queue: Greg Thompson <grt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#521652}
parent 5c8a2414
......@@ -458,7 +458,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_BrowserAccelerators) {
#define MAYBE_PopupAccelerators PopupAccelerators
#endif
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_PopupAccelerators) {
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_PopupAccelerators) {
// Create a popup.
Browser* popup = CreateBrowserForPopup(browser()->profile());
ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(popup));
......@@ -514,7 +514,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_PopupAccelerators) {
#define MAYBE_BackspaceInKeywordMode BackspaceInKeywordMode
#endif
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_BackspaceInKeywordMode) {
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_BackspaceInKeywordMode) {
OmniboxView* omnibox_view = NULL;
ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
......@@ -568,8 +568,8 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_BackspaceInKeywordMode) {
UTF16ToUTF8(omnibox_view->GetText()));
}
// Flaky on Linux. http://crbug.com/751543
#if defined(OS_LINUX)
// Flaky on Windows and Linux. http://crbug.com/751543
#if defined(OS_WIN) || defined(OS_LINUX)
#define MAYBE_Escape DISABLED_Escape
#else
#define MAYBE_Escape Escape
......@@ -601,7 +601,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_Escape) {
#define MAYBE_DesiredTLD DesiredTLD
#endif
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_DesiredTLD) {
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_DesiredTLD) {
OmniboxView* omnibox_view = NULL;
ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
OmniboxPopupModel* popup_model = omnibox_view->model()->popup_model();
......@@ -633,7 +633,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_DesiredTLD) {
#define MAYBE_DesiredTLDWithTemporaryText DesiredTLDWithTemporaryText
#endif
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_DesiredTLDWithTemporaryText) {
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_DesiredTLDWithTemporaryText) {
OmniboxView* omnibox_view = NULL;
ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
OmniboxPopupModel* popup_model = omnibox_view->model()->popup_model();
......@@ -684,16 +684,8 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_DesiredTLDWithTemporaryText) {
}
// See http://crbug.com/431575.
#if defined(OS_WIN)
#define MAYBE_ClearUserTextAfterBackgroundCommit \
ClearUserTextAfterBackgroundCommit
#else
// Flaky; https;//crbug.com/751031.
#define MAYBE_ClearUserTextAfterBackgroundCommit \
DISABLED_ClearUserTextAfterBackgroundCommit
#endif
IN_PROC_BROWSER_TEST_F(OmniboxViewTest,
MAYBE_ClearUserTextAfterBackgroundCommit) {
DISABLED_ClearUserTextAfterBackgroundCommit) {
OmniboxView* omnibox_view = NULL;
ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
......@@ -722,13 +714,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest,
EXPECT_EQ(ASCIIToUTF16(url2.spec()), omnibox_view->GetText());
}
#if defined(OS_WIN)
#define MAYBE_AltEnter AltEnter
#else
// https://crbug.com/751031
#define MAYBE_AltEnter DISABLED_AltEnter
#endif
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_AltEnter) {
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_AltEnter) {
OmniboxView* omnibox_view = NULL;
ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
......@@ -789,13 +775,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_EnterToSearch) {
EXPECT_EQ("http://www.foo.com/search?q=z", url.spec());
}
#if defined(OS_WIN)
#define MAYBE_EscapeToDefaultMatch EscapeToDefaultMatch
#else
// https://crbug.com/751031
#define MAYBE_EscapeToDefaultMatch DISABLED_EscapeToDefaultMatch
#endif
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_EscapeToDefaultMatch) {
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_EscapeToDefaultMatch) {
OmniboxView* omnibox_view = NULL;
ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
OmniboxPopupModel* popup_model = omnibox_view->model()->popup_model();
......@@ -831,13 +811,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_EscapeToDefaultMatch) {
EXPECT_EQ(old_selected_line, popup_model->selected_line());
}
#if defined(OS_WIN)
#define MAYBE_BasicTextOperations BasicTextOperations
#else
// https://crbug.com/751031
#define MAYBE_BasicTextOperations DISABLED_BasicTextOperations
#endif
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_BasicTextOperations) {
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_BasicTextOperations) {
ui_test_utils::NavigateToURL(browser(), GURL(url::kAboutBlankURL));
chrome::FocusLocationBar(browser());
......@@ -931,13 +905,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_BasicTextOperations) {
// Make sure the cursor position doesn't get set past the last character of
// user input text when the URL is longer than the keyword.
// (http://crbug.com/656209)
#if defined(OS_WIN)
#define MAYBE_FocusSearchLongUrl FocusSearchLongUrl
#else
// https://crbug.com/751031.
#define MAYBE_FocusSearchLongUrl DISABLED_FocusSearchLongUrl
#endif
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_FocusSearchLongUrl) {
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_FocusSearchLongUrl) {
OmniboxView* omnibox_view = NULL;
ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
......@@ -951,15 +919,8 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_FocusSearchLongUrl) {
// Make sure the display text is preserved when calling FocusSearch() when the
// display text is not the permanent text.
#if defined(OS_WIN)
#define MAYBE_PreserveDisplayTextOnFocusSearch PreserveDisplayTextOnFocusSearch
#else
// https://crbug.com/751031.
#define MAYBE_PreserveDisplayTextOnFocusSearch \
DISABLED_PreserveDisplayTextOnFocusSearch
#endif
IN_PROC_BROWSER_TEST_F(OmniboxViewTest,
MAYBE_PreserveDisplayTextOnFocusSearch) {
DISABLED_PreserveDisplayTextOnFocusSearch) {
OmniboxView* omnibox_view = NULL;
ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
......@@ -1011,16 +972,8 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest,
EXPECT_EQ(19U, std::max(start, end));
}
#if defined(OS_WIN)
#define MAYBE_AcceptKeywordByTypingQuestionMark \
AcceptKeywordByTypingQuestionMark
#else
// https://crbug.com/751031
#define MAYBE_AcceptKeywordByTypingQuestionMark \
DISABLED_AcceptKeywordByTypingQuestionMark
#endif
IN_PROC_BROWSER_TEST_F(OmniboxViewTest,
MAYBE_AcceptKeywordByTypingQuestionMark) {
DISABLED_AcceptKeywordByTypingQuestionMark) {
OmniboxView* omnibox_view = NULL;
ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
......@@ -1042,8 +995,8 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest,
EXPECT_FALSE(omnibox_view->model()->is_keyword_selected());
}
// Flaky on Linux. http://crbug.com/751543
#if defined(OS_LINUX)
// Flaky on Windows and Linux. http://crbug.com/751543
#if defined(OS_WIN) || defined(OS_LINUX)
#define MAYBE_AcceptKeywordBySpace DISABLED_AcceptKeywordBySpace
#else
#define MAYBE_AcceptKeywordBySpace AcceptKeywordBySpace
......@@ -1418,7 +1371,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_DeleteItem) {
#define MAYBE_TabAcceptKeyword TabAcceptKeyword
#endif
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_TabAcceptKeyword) {
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_TabAcceptKeyword) {
OmniboxView* omnibox_view = NULL;
ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
......@@ -1473,7 +1426,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_TabAcceptKeyword) {
#define MAYBE_TabTraverseResultsTest TabTraverseResultsTest
#endif
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_TabTraverseResultsTest) {
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_TabTraverseResultsTest) {
OmniboxView* omnibox_view = NULL;
ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
OmniboxPopupModel* popup_model = omnibox_view->model()->popup_model();
......@@ -1566,7 +1519,8 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_TabTraverseResultsTest) {
#define MAYBE_PersistKeywordModeOnTabSwitch PersistKeywordModeOnTabSwitch
#endif
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_PersistKeywordModeOnTabSwitch) {
IN_PROC_BROWSER_TEST_F(OmniboxViewTest,
DISABLED_PersistKeywordModeOnTabSwitch) {
OmniboxView* omnibox_view = NULL;
ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
......@@ -1614,7 +1568,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_PersistKeywordModeOnTabSwitch) {
#endif
IN_PROC_BROWSER_TEST_F(OmniboxViewTest,
MAYBE_CtrlKeyPressedWithInlineAutocompleteTest) {
DISABLED_CtrlKeyPressedWithInlineAutocompleteTest) {
OmniboxView* omnibox_view = NULL;
ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
OmniboxPopupModel* popup_model = omnibox_view->model()->popup_model();
......@@ -1637,13 +1591,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest,
EXPECT_EQ(old_text, omnibox_view->GetText());
}
#if defined(OS_WIN)
#define MAYBE_UndoRedo UndoRedo
#else
// https://crbug.com/751031.
#define MAYBE_UndoRedo DISABLED_UndoRedo
#endif
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_UndoRedo) {
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_UndoRedo) {
ui_test_utils::NavigateToURL(browser(), GURL(url::kAboutBlankURL));
chrome::FocusLocationBar(browser());
......@@ -1712,15 +1660,8 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_UndoRedo) {
EXPECT_EQ(old_text, omnibox_view->GetText());
}
#if defined(OS_WIN)
#define MAYBE_BackspaceDeleteHalfWidthKatakana BackspaceDeleteHalfWidthKatakana
#else
// https://crbug.com/751031
#define MAYBE_BackspaceDeleteHalfWidthKatakana \
DISABLED_BackspaceDeleteHalfWidthKatakana
#endif
IN_PROC_BROWSER_TEST_F(OmniboxViewTest,
MAYBE_BackspaceDeleteHalfWidthKatakana) {
DISABLED_BackspaceDeleteHalfWidthKatakana) {
OmniboxView* omnibox_view = NULL;
ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
// Insert text: ダ. This is two, 3-byte UTF-8 characters:
......@@ -1746,13 +1687,8 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest,
#endif
}
#if defined(OS_WIN)
#define MAYBE_DoesNotUpdateAutocompleteOnBlur DoesNotUpdateAutocompleteOnBlur
#else
#define MAYBE_DoesNotUpdateAutocompleteOnBlur \
DISABLED_DoesNotUpdateAutocompleteOnBlur
#endif
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_DoesNotUpdateAutocompleteOnBlur) {
IN_PROC_BROWSER_TEST_F(OmniboxViewTest,
DISABLED_DoesNotUpdateAutocompleteOnBlur) {
OmniboxView* omnibox_view = NULL;
ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
OmniboxPopupModel* popup_model = omnibox_view->model()->popup_model();
......@@ -1776,13 +1712,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_DoesNotUpdateAutocompleteOnBlur) {
omnibox_view->model()->autocomplete_controller()->input_.text());
}
#if defined(OS_WIN)
#define MAYBE_Paste Paste
#else
// https://crbug.com/751031.
#define MAYBE_Paste DISABLED_Paste
#endif
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_Paste) {
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_Paste) {
OmniboxView* omnibox_view = NULL;
ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
OmniboxPopupModel* popup_model = omnibox_view->model()->popup_model();
......@@ -1823,13 +1753,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_Paste) {
// TODO(msw): Test that AltGr+V does not paste.
}
#if defined(OS_WIN)
#define MAYBE_CopyURLToClipboard CopyURLToClipboard
#else
// https://crbug.com/751031
#define MAYBE_CopyURLToClipboard DISABLED_CopyURLToClipboard
#endif
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_CopyURLToClipboard) {
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_CopyURLToClipboard) {
// Set permanent text thus making sure that omnibox treats 'google.com'
// as URL (not as ordinary user input).
OmniboxView* omnibox_view = NULL;
......@@ -1872,13 +1796,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_CopyURLToClipboard) {
EXPECT_EQ(target_url, url);
}
#if defined(OS_WIN)
#define MAYBE_CutURLToClipboard CutURLToClipboard
#else
// https://crbug.com/751031
#define MAYBE_CutURLToClipboard DISABLED_CutURLToClipboard
#endif
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_CutURLToClipboard) {
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_CutURLToClipboard) {
// Set permanent text thus making sure that omnibox treats 'google.com'
// as URL (not as ordinary user input).
OmniboxView* omnibox_view = NULL;
......@@ -1921,13 +1839,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_CutURLToClipboard) {
EXPECT_EQ(target_url, url);
}
#if defined(OS_WIN)
#define MAYBE_CopyTextToClipboard CopyTextToClipboard
#else
// https://crbug.com/751031
#define MAYBE_CopyTextToClipboard DISABLED_CopyTextToClipboard
#endif
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_CopyTextToClipboard) {
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_CopyTextToClipboard) {
OmniboxView* omnibox_view = NULL;
ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
const char* target_text = "foo";
......@@ -1950,13 +1862,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_CopyTextToClipboard) {
EXPECT_EQ(ASCIIToUTF16(target_text), omnibox_view->GetText());
}
#if defined(OS_WIN)
#define MAYBE_CutTextToClipboard CutTextToClipboard
#else
// https://crbug.com/751031
#define MAYBE_CutTextToClipboard DISABLED_CutTextToClipboard
#endif
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_CutTextToClipboard) {
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_CutTextToClipboard) {
OmniboxView* omnibox_view = NULL;
ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
const char* target_text = "foo";
......@@ -1979,12 +1885,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_CutTextToClipboard) {
EXPECT_EQ(base::string16(), omnibox_view->GetText());
}
#if defined(OS_WIN)
#define MAYBE_EditSearchEngines EditSearchEngines
#else
#define MAYBE_EditSearchEngines DISABLED_EditSearchEngines
#endif
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_EditSearchEngines) {
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_EditSearchEngines) {
OmniboxView* omnibox_view = nullptr;
ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
#if defined(OS_CHROMEOS)
......@@ -2006,14 +1907,8 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_EditSearchEngines) {
EXPECT_FALSE(omnibox_view->model()->popup_model()->IsOpen());
}
#if defined(OS_WIN)
#define MAYBE_CtrlArrowAfterArrowSuggestions CtrlArrowAfterArrowSuggestions
#else
// https://crbug.com/751031
#define MAYBE_CtrlArrowAfterArrowSuggestions \
DISABLED_CtrlArrowAfterArrowSuggestions
#endif
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_CtrlArrowAfterArrowSuggestions) {
IN_PROC_BROWSER_TEST_F(OmniboxViewTest,
DISABLED_CtrlArrowAfterArrowSuggestions) {
OmniboxView* omnibox_view = NULL;
ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
OmniboxPopupModel* popup_model = omnibox_view->model()->popup_model();
......
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