Commit 3074c550 authored by Bret Sepulveda's avatar Bret Sepulveda Committed by Commit Bot

Re-enable extensions toolbar menu and tab hover card browser tests.

After landing crrev.com/c/2054095 these tests should no longer be flaky,
so they are re-enabled. If one of these tests begins flaking independent
of the others, please disable it individually.

Bug: 1050712, 1049036, 1049063, 1048980, 1048956, 932402, 947668
Change-Id: I2a18bdad8ae07155a0ff9333e7547e0338d07834
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2059413Reviewed-by: default avatarHuanzhong Huang <huanzhong@chromium.org>
Commit-Queue: Bret Sepulveda <bsep@chromium.org>
Cr-Commit-Position: refs/heads/master@{#742095}
parent 83d546a2
...@@ -279,14 +279,7 @@ class ExtensionsMenuViewBrowserTest : public ExtensionsToolbarBrowserTest { ...@@ -279,14 +279,7 @@ class ExtensionsMenuViewBrowserTest : public ExtensionsToolbarBrowserTest {
std::string ui_test_name_; std::string ui_test_name_;
}; };
// TODO(crbug.com/1050712): the test is flaky. IN_PROC_BROWSER_TEST_F(ExtensionsMenuViewBrowserTest, InvokeUi_default) {
// TODO(crbug.com/1050712): the test is flaky.
#if defined(OS_MACOSX) || defined(OS_LINUX)
#define MAYBE_InvokeUi_default DISABLED_InvokeUi_default
#else
#define MAYBE_InvokeUi_default InvokeUi_default
#endif
IN_PROC_BROWSER_TEST_F(ExtensionsMenuViewBrowserTest, MAYBE_InvokeUi_default) {
LoadTestExtension("extensions/uitest/long_name"); LoadTestExtension("extensions/uitest/long_name");
LoadTestExtension("extensions/uitest/window_open"); LoadTestExtension("extensions/uitest/window_open");
...@@ -363,8 +356,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionsMenuViewBrowserTest, ...@@ -363,8 +356,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionsMenuViewBrowserTest,
ShowAndVerifyUi(); ShowAndVerifyUi();
} }
// TODO(crbug.com/1050712): the test is flaky. IN_PROC_BROWSER_TEST_F(ExtensionsMenuViewBrowserTest, TriggerPopup) {
IN_PROC_BROWSER_TEST_F(ExtensionsMenuViewBrowserTest, DISABLED_TriggerPopup) {
LoadTestExtension("extensions/simple_with_popup"); LoadTestExtension("extensions/simple_with_popup");
ShowUi(""); ShowUi("");
VerifyUi(); VerifyUi();
...@@ -396,9 +388,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionsMenuViewBrowserTest, DISABLED_TriggerPopup) { ...@@ -396,9 +388,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionsMenuViewBrowserTest, DISABLED_TriggerPopup) {
EXPECT_TRUE(GetVisibleToolbarActionViews().empty()); EXPECT_TRUE(GetVisibleToolbarActionViews().empty());
} }
// TODO(crbug.com/1049063): Flaky on various platforms.
IN_PROC_BROWSER_TEST_F(ExtensionsMenuViewBrowserTest, IN_PROC_BROWSER_TEST_F(ExtensionsMenuViewBrowserTest,
DISABLED_RemoveExtensionShowingPopup) { RemoveExtensionShowingPopup) {
LoadTestExtension("extensions/simple_with_popup"); LoadTestExtension("extensions/simple_with_popup");
ShowUi(""); ShowUi("");
VerifyUi(); VerifyUi();
...@@ -422,9 +413,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionsMenuViewBrowserTest, ...@@ -422,9 +413,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionsMenuViewBrowserTest,
EXPECT_TRUE(GetVisibleToolbarActionViews().empty()); EXPECT_TRUE(GetVisibleToolbarActionViews().empty());
} }
// TODO(crbug.com/1049036): Flaky on various platforms.
IN_PROC_BROWSER_TEST_F(ExtensionsMenuViewBrowserTest, IN_PROC_BROWSER_TEST_F(ExtensionsMenuViewBrowserTest,
DISABLED_TriggeringExtensionClosesMenu) { TriggeringExtensionClosesMenu) {
LoadTestExtension("extensions/trigger_actions/browser_action"); LoadTestExtension("extensions/trigger_actions/browser_action");
ShowUi(""); ShowUi("");
VerifyUi(); VerifyUi();
...@@ -449,15 +439,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionsMenuViewBrowserTest, ...@@ -449,15 +439,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionsMenuViewBrowserTest,
EXPECT_FALSE(ExtensionsMenuView::IsShowing()); EXPECT_FALSE(ExtensionsMenuView::IsShowing());
} }
// TODO(crbug.com/1050712): the test is flaky.
#if defined(OS_WIN) || defined(OS_LINUX)
#define MAYBE_CreatesOneMenuItemPerExtension \
DISABLED_CreatesOneMenuItemPerExtension
#else
#define MAYBE_CreatesOneMenuItemPerExtension CreatesOneMenuItemPerExtension
#endif
IN_PROC_BROWSER_TEST_F(ExtensionsMenuViewBrowserTest, IN_PROC_BROWSER_TEST_F(ExtensionsMenuViewBrowserTest,
MAYBE_CreatesOneMenuItemPerExtension) { CreatesOneMenuItemPerExtension) {
LoadTestExtension("extensions/uitest/long_name"); LoadTestExtension("extensions/uitest/long_name");
LoadTestExtension("extensions/uitest/window_open"); LoadTestExtension("extensions/uitest/window_open");
ShowUi(""); ShowUi("");
...@@ -467,14 +450,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionsMenuViewBrowserTest, ...@@ -467,14 +450,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionsMenuViewBrowserTest,
DismissUi(); DismissUi();
} }
// TODO(crbug.com/1050712): the test is flaky.
#if defined(OS_WIN)
#define MAYBE_PinningDisabledInIncognito DISABLED_PinningDisabledInIncognito
#else
#define MAYBE_PinningDisabledInIncognito PinningDisabledInIncognito
#endif
IN_PROC_BROWSER_TEST_F(ExtensionsMenuViewBrowserTest, IN_PROC_BROWSER_TEST_F(ExtensionsMenuViewBrowserTest,
MAYBE_PinningDisabledInIncognito) { PinningDisabledInIncognito) {
LoadTestExtension("extensions/uitest/window_open", true); LoadTestExtension("extensions/uitest/window_open", true);
SetUpIncognitoBrowser(); SetUpIncognitoBrowser();
...@@ -499,9 +476,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionsMenuViewBrowserTest, ...@@ -499,9 +476,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionsMenuViewBrowserTest,
DismissUi(); DismissUi();
} }
// TODO(crbug.com/1048980): Flaky on various platforms.
IN_PROC_BROWSER_TEST_F(ExtensionsMenuViewBrowserTest, IN_PROC_BROWSER_TEST_F(ExtensionsMenuViewBrowserTest,
DISABLED_ManageExtensionsOpensExtensionsPage) { ManageExtensionsOpensExtensionsPage) {
// Ensure the menu is visible by adding an extension. // Ensure the menu is visible by adding an extension.
LoadTestExtension("extensions/trigger_actions/browser_action"); LoadTestExtension("extensions/trigger_actions/browser_action");
ShowUi(""); ShowUi("");
...@@ -565,14 +541,8 @@ class ActivateWithReloadExtensionsMenuBrowserTest ...@@ -565,14 +541,8 @@ class ActivateWithReloadExtensionsMenuBrowserTest
: public ExtensionsMenuViewBrowserTest, : public ExtensionsMenuViewBrowserTest,
public ::testing::WithParamInterface<bool> {}; public ::testing::WithParamInterface<bool> {};
// Flaky on windows, http://crbug.com/1048956
#if defined(OS_WIN)
#define MAYBE_ActivateWithReload DISABLED_ActivateWithReload
#else
#define MAYBE_ActivateWithReload ActivateWithReload
#endif
IN_PROC_BROWSER_TEST_P(ActivateWithReloadExtensionsMenuBrowserTest, IN_PROC_BROWSER_TEST_P(ActivateWithReloadExtensionsMenuBrowserTest,
MAYBE_ActivateWithReload) { ActivateWithReload) {
ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(embedded_test_server()->Start());
LoadTestExtension("extensions/blocked_actions/content_scripts"); LoadTestExtension("extensions/blocked_actions/content_scripts");
auto extension = extensions().back(); auto extension = extensions().back();
......
...@@ -145,14 +145,8 @@ class TabHoverCardBubbleViewBrowserTest : public DialogBrowserTest { ...@@ -145,14 +145,8 @@ class TabHoverCardBubbleViewBrowserTest : public DialogBrowserTest {
DISALLOW_COPY_AND_ASSIGN(TabHoverCardBubbleViewBrowserTest); DISALLOW_COPY_AND_ASSIGN(TabHoverCardBubbleViewBrowserTest);
}; };
// Fails on win: http://crbug.com/932402.
#if defined(OS_WIN)
#define MAYBE_InvokeUi_tab_hover_card DISABLED_InvokeUi_tab_hover_card
#else
#define MAYBE_InvokeUi_tab_hover_card InvokeUi_tab_hover_card
#endif
IN_PROC_BROWSER_TEST_F(TabHoverCardBubbleViewBrowserTest, IN_PROC_BROWSER_TEST_F(TabHoverCardBubbleViewBrowserTest,
MAYBE_InvokeUi_tab_hover_card) { InvokeUi_tab_hover_card) {
ShowAndVerifyUi(); ShowAndVerifyUi();
} }
......
...@@ -66,14 +66,8 @@ class TabHoverCardBubbleViewInteractiveUiTest : public InProcessBrowserTest { ...@@ -66,14 +66,8 @@ class TabHoverCardBubbleViewInteractiveUiTest : public InProcessBrowserTest {
#if defined(USE_AURA) #if defined(USE_AURA)
// Verify that the hover card is not visible when any key is pressed. // Verify that the hover card is not visible when any key is pressed.
// TODO(crbug.com/947668): The test is flaky on Win10.
#if defined(OS_WIN)
#define MAYBE_HoverCardHidesOnAnyKeyPressInSameWindow DISABLED_HoverCardHidesOnAnyKeyPressInSameWindow
#else
#define MAYBE_HoverCardHidesOnAnyKeyPressInSameWindow HoverCardHidesOnAnyKeyPressInSameWindow
#endif
IN_PROC_BROWSER_TEST_F(TabHoverCardBubbleViewInteractiveUiTest, IN_PROC_BROWSER_TEST_F(TabHoverCardBubbleViewInteractiveUiTest,
MAYBE_HoverCardHidesOnAnyKeyPressInSameWindow) { HoverCardHidesOnAnyKeyPressInSameWindow) {
TabStrip* tab_strip = TabStrip* tab_strip =
BrowserView::GetBrowserViewForBrowser(browser())->tabstrip(); BrowserView::GetBrowserViewForBrowser(browser())->tabstrip();
Tab* tab = tab_strip->tab_at(0); Tab* tab = tab_strip->tab_at(0);
......
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