Skip to content

GitLab

T
tangled
Commit 11aa0507 authored by Robert Liao's avatar Robert Liao Committed by Commit Bot
Browse files
Options

Disable MacViews Tests Impacted by Focus and/or Input Issues 

BUG=824418

Change-Id: Iab8ded70524c59d50f8c10646df2a3dd3ee71dfe
Reviewed-on: https://chromium-review.googlesource.com/974072
Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
Reviewed-by: default avatarElly Fong-Jones <ellyjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545050}
parent 9d983e1e
Show whitespace changes
Inline Side-by-side
Showing with 61 additions and 8 deletions
chrome/browser/ui/views/extensions/extension_dialog_interactive_uitest.cc
View file @ 11aa0507
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include "chrome/browser/ui/views/extensions/extension_dialog.h" #include "chrome/browser/ui/views/extensions/extension_dialog.h"
#include "build/build_config.h"
#include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_browsertest.h"
#include "chrome/browser/extensions/extension_view_host.h" #include "chrome/browser/extensions/extension_view_host.h"
#include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/browser_window.h"
...@@ -27,7 +28,13 @@ class ExtensionDialogUiTest : public ExtensionBrowserTest { ...@@ -27,7 +28,13 @@ class ExtensionDialogUiTest : public ExtensionBrowserTest {
} // namespace } // namespace
IN_PROC_BROWSER_TEST_F(ExtensionDialogUiTest, TabFocusLoop) { #if defined(OS_MACOSX)
// Focusing or input is not completely working on Mac: http://crbug.com/824418
#define MAYBE_TabFocusLoop DISABLED_TabFocusLoop
#else
#define MAYBE_TabFocusLoop TabFocusLoop
#endif
IN_PROC_BROWSER_TEST_F(ExtensionDialogUiTest, MAYBE_TabFocusLoop) {
ExtensionTestMessageListener init_listener("ready", false /* will_reply */); ExtensionTestMessageListener init_listener("ready", false /* will_reply */);
ExtensionTestMessageListener button1_focus_listener("button1-focused", false); ExtensionTestMessageListener button1_focus_listener("button1-focused", false);
ExtensionTestMessageListener button2_focus_listener("button2-focused", false); ExtensionTestMessageListener button2_focus_listener("button2-focused", false);
......
chrome/browser/ui/views/keyboard_access_browsertest.cc
View file @ 11aa0507
...@@ -391,12 +391,18 @@ IN_PROC_BROWSER_TEST_F(KeyboardAccessTest, TestMenuKeyboardOpenDismiss) { ...@@ -391,12 +391,18 @@ IN_PROC_BROWSER_TEST_F(KeyboardAccessTest, TestMenuKeyboardOpenDismiss) {
} }
#endif #endif
#if defined(OS_MACOSX)
// Focusing or input is not completely working on Mac: http://crbug.com/824418
#define MAYBE_ReserveKeyboardAccelerators DISABLED_ReserveKeyboardAccelerators
#else
#define MAYBE_ReserveKeyboardAccelerators ReserveKeyboardAccelerators
#endif
// Test that JavaScript cannot intercept reserved keyboard accelerators like // Test that JavaScript cannot intercept reserved keyboard accelerators like
// ctrl-t to open a new tab or ctrl-f4 to close a tab. // ctrl-t to open a new tab or ctrl-f4 to close a tab.
// TODO(isherman): This test times out on ChromeOS. We should merge it with // TODO(isherman): This test times out on ChromeOS. We should merge it with
// BrowserKeyEventsTest.ReservedAccelerators, but just disable for now. // BrowserKeyEventsTest.ReservedAccelerators, but just disable for now.
// If this flakes, use http://crbug.com/62311. // If this flakes, use http://crbug.com/62311.
IN_PROC_BROWSER_TEST_F(KeyboardAccessTest, ReserveKeyboardAccelerators) { IN_PROC_BROWSER_TEST_F(KeyboardAccessTest, MAYBE_ReserveKeyboardAccelerators) {
const std::string kBadPage = const std::string kBadPage =
"<html><script>" "<html><script>"
"document.onkeydown = function() {" "document.onkeydown = function() {"
......
chrome/browser/ui/views/location_bar/location_icon_view_interactive_uitest.cc
View file @ 11aa0507
...@@ -27,8 +27,14 @@ class LocationIconViewTest : public InProcessBrowserTest { ...@@ -27,8 +27,14 @@ class LocationIconViewTest : public InProcessBrowserTest {
DISALLOW_COPY_AND_ASSIGN(LocationIconViewTest); DISALLOW_COPY_AND_ASSIGN(LocationIconViewTest);
}; };
#if defined(OS_MACOSX)
// Focusing or input is not completely working on Mac: http://crbug.com/824418
#define MAYBE_HideOnSecondClick DISABLED_HideOnSecondClick
#else
#define MAYBE_HideOnSecondClick HideOnSecondClick
#endif
// Verify that clicking the location icon a second time hides the bubble. // Verify that clicking the location icon a second time hides the bubble.
IN_PROC_BROWSER_TEST_F(LocationIconViewTest, HideOnSecondClick) { IN_PROC_BROWSER_TEST_F(LocationIconViewTest, MAYBE_HideOnSecondClick) {
BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser()); BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser());
views::View* location_icon_view = views::View* location_icon_view =
browser_view->toolbar()->location_bar()->location_icon_view(); browser_view->toolbar()->location_bar()->location_icon_view();
......
chrome/browser/ui/views/location_bar/star_view_browsertest.cc
View file @ 11aa0507
...@@ -47,6 +47,9 @@ class StarViewTest : public InProcessBrowserTest { ...@@ -47,6 +47,9 @@ class StarViewTest : public InProcessBrowserTest {
// bubble. // bubble.
#if defined(OS_LINUX) && defined(USE_AURA) && !defined(OS_CHROMEOS) #if defined(OS_LINUX) && defined(USE_AURA) && !defined(OS_CHROMEOS)
#define MAYBE_HideOnSecondClick DISABLED_HideOnSecondClick #define MAYBE_HideOnSecondClick DISABLED_HideOnSecondClick
#elif defined(OS_MACOSX)
// Focusing or input is not completely working on Mac: http://crbug.com/824418
#define MAYBE_HideOnSecondClick DISABLED_HideOnSecondClick
#else #else
#define MAYBE_HideOnSecondClick HideOnSecondClick #define MAYBE_HideOnSecondClick HideOnSecondClick
#endif #endif
......
chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc
View file @ 11aa0507
...@@ -332,7 +332,14 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, SelectAllOnTabToFocus) { ...@@ -332,7 +332,14 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, SelectAllOnTabToFocus) {
EXPECT_TRUE(omnibox_view->IsSelectAll()); EXPECT_TRUE(omnibox_view->IsSelectAll());
} }
IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, CloseOmniboxPopupOnTextDrag) { #if defined(OS_MACOSX)
// Focusing or input is not completely working on Mac: http://crbug.com/824418
#define MAYBE_CloseOmniboxPopupOnTextDrag DISABLED_CloseOmniboxPopupOnTextDrag
#else
#define MAYBE_CloseOmniboxPopupOnTextDrag CloseOmniboxPopupOnTextDrag
#endif
IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest,
MAYBE_CloseOmniboxPopupOnTextDrag) {
OmniboxView* omnibox_view = nullptr; OmniboxView* omnibox_view = nullptr;
ASSERT_NO_FATAL_FAILURE(GetOmniboxViewForBrowser(browser(), &omnibox_view)); ASSERT_NO_FATAL_FAILURE(GetOmniboxViewForBrowser(browser(), &omnibox_view));
OmniboxViewViews* omnibox_view_views = OmniboxViewViews* omnibox_view_views =
......
chrome/browser/ui/views/sad_tab_view_interactive_uitest.cc
View file @ 11aa0507
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include "chrome/browser/ui/views/sad_tab_view.h" #include "chrome/browser/ui/views/sad_tab_view.h"
#include "build/build_config.h"
#include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_commands.h"
#include "chrome/browser/ui/sad_tab.h" #include "chrome/browser/ui/sad_tab.h"
...@@ -132,8 +133,14 @@ class SadTabViewInteractiveUITest : public InProcessBrowserTest { ...@@ -132,8 +133,14 @@ class SadTabViewInteractiveUITest : public InProcessBrowserTest {
DISALLOW_COPY_AND_ASSIGN(SadTabViewInteractiveUITest); DISALLOW_COPY_AND_ASSIGN(SadTabViewInteractiveUITest);
}; };
#if defined(OS_MACOSX)
// Focusing or input is not completely working on Mac: http://crbug.com/824418
#define MAYBE_SadTabKeyboardAccessibility DISABLED_SadTabKeyboardAccessibility
#else
#define MAYBE_SadTabKeyboardAccessibility SadTabKeyboardAccessibility
#endif
IN_PROC_BROWSER_TEST_F(SadTabViewInteractiveUITest, IN_PROC_BROWSER_TEST_F(SadTabViewInteractiveUITest,
SadTabKeyboardAccessibility) { MAYBE_SadTabKeyboardAccessibility) {
ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(embedded_test_server()->Start());
GURL url(embedded_test_server()->GetURL("/links.html")); GURL url(embedded_test_server()->GetURL("/links.html"));
ui_test_utils::NavigateToURL(browser(), url); ui_test_utils::NavigateToURL(browser(), url);
...@@ -167,7 +174,14 @@ IN_PROC_BROWSER_TEST_F(SadTabViewInteractiveUITest, ...@@ -167,7 +174,14 @@ IN_PROC_BROWSER_TEST_F(SadTabViewInteractiveUITest,
ASSERT_TRUE(IsFocusedViewInsideBrowserToolbar()); ASSERT_TRUE(IsFocusedViewInsideBrowserToolbar());
} }
IN_PROC_BROWSER_TEST_F(SadTabViewInteractiveUITest, ReloadMultipleSadTabs) { #if defined(OS_MACOSX)
// Focusing or input is not completely working on Mac: http://crbug.com/824418
#define MAYBE_ReloadMultipleSadTabs DISABLED_ReloadMultipleSadTabs
#else
#define MAYBE_ReloadMultipleSadTabs ReloadMultipleSadTabs
#endif
IN_PROC_BROWSER_TEST_F(SadTabViewInteractiveUITest,
MAYBE_ReloadMultipleSadTabs) {
ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(embedded_test_server()->Start());
GURL url(embedded_test_server()->GetURL("/links.html")); GURL url(embedded_test_server()->GetURL("/links.html"));
ui_test_utils::NavigateToURL(browser(), url); ui_test_utils::NavigateToURL(browser(), url);
......
chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc
View file @ 11aa0507
...@@ -317,7 +317,13 @@ IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorTest, SelectNone) { ...@@ -317,7 +317,13 @@ IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorTest, SelectNone) {
// Let the mock get checked on destruction. // Let the mock get checked on destruction.
} }
IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorTest, Escape) { #if defined(OS_MACOSX)
// Focusing or input is not completely working on Mac: http://crbug.com/824418
#define MAYBE_Escape DISABLED_Escape
#else
#define MAYBE_Escape Escape
#endif
IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorTest, MAYBE_Escape) {
EXPECT_CALL(*auth_requestor_.get(), CertificateSelected(nullptr, nullptr)); EXPECT_CALL(*auth_requestor_.get(), CertificateSelected(nullptr, nullptr));
EXPECT_TRUE(ui_test_utils::SendKeyPressSync( EXPECT_TRUE(ui_test_utils::SendKeyPressSync(
...@@ -337,7 +343,7 @@ IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorTest, SelectDefault) { ...@@ -337,7 +343,7 @@ IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorTest, SelectDefault) {
Mock::VerifyAndClear(auth_requestor_.get()); Mock::VerifyAndClear(auth_requestor_.get());
} }
IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorMultiTabTest, Escape) { IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorMultiTabTest, MAYBE_Escape) {
// auth_requestor_1_ should get selected automatically by the // auth_requestor_1_ should get selected automatically by the
// SSLClientAuthObserver when selector_2_ is accepted, since both 1 & 2 have // SSLClientAuthObserver when selector_2_ is accepted, since both 1 & 2 have
// the same host:port. // the same host:port.
......
chrome/browser/ui/views/toolbar/toolbar_action_view_interactive_uitest.cc
View file @ 11aa0507
...@@ -278,6 +278,10 @@ IN_PROC_BROWSER_TEST_F(ToolbarActionViewInteractiveUITest, ...@@ -278,6 +278,10 @@ IN_PROC_BROWSER_TEST_F(ToolbarActionViewInteractiveUITest,
(defined(OS_WIN) && !defined(NDEBUG)) (defined(OS_WIN) && !defined(NDEBUG))
// Flaky on Linux and ChromeOS; see https://crbug.com/617056. // Flaky on Linux and ChromeOS; see https://crbug.com/617056.
// Fails on Win debug; see https;//crbug.com/788112. // Fails on Win debug; see https;//crbug.com/788112.
#define MAYBE_DoubleClickToolbarActionToClose \
DISABLED_DoubleClickToolbarActionToClose
#elif defined(OS_MACOSX)
// Focusing or input is not completely working on Mac: http://crbug.com/824418
#define MAYBE_DoubleClickToolbarActionToClose \ #define MAYBE_DoubleClickToolbarActionToClose \
DISABLED_DoubleClickToolbarActionToClose DISABLED_DoubleClickToolbarActionToClose
#else #else
......
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