Commit be6c3c92 authored by Will Harris's avatar Will Harris Committed by Commit Bot

Disable a few views tests that don't pass on latest Windows versions.

This CL disables:

BookmarkBarViewTest10.KeyEvents
BookmarkBarViewTest23.ContextMenusKeyboard
BookmarkBarViewTest24.ContextMenusKeyboardEscape
TouchEventsRecursiveViewTest.CheckWindowsRecursiveHandler
TouchEventsViewTest.CheckWindowsNativeMessageForTouchEvents

This is because the ui_controls::SendTouchEvents used in these
tests has proven flaky on latest versions of Windows.

BUG=1108551,523255

Change-Id: Ia1baa719a4baa2dc29b78ebcac7d3a71070c0f8b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2380811Reviewed-by: default avatarScott Violet <sky@chromium.org>
Commit-Queue: Will Harris <wfh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#802507}
parent 0724cd03
...@@ -1156,7 +1156,13 @@ class BookmarkBarViewTest10 : public BookmarkBarViewEventTestBase { ...@@ -1156,7 +1156,13 @@ class BookmarkBarViewTest10 : public BookmarkBarViewEventTestBase {
} }
}; };
VIEW_TEST(BookmarkBarViewTest10, KeyEvents) #if defined(OS_WIN) // Fails on latest versions of Windows.
// https://crbug.com/1108551.
#define MAYBE_KeyEvents DISABLED_KeyEvents
#else
#define MAYBE_KeyEvents KeyEvents
#endif
VIEW_TEST(BookmarkBarViewTest10, MAYBE_KeyEvents)
// Make sure the menu closes with the following sequence: show menu, show // Make sure the menu closes with the following sequence: show menu, show
// context menu, close context menu (via escape), then click else where. This // context menu, close context menu (via escape), then click else where. This
...@@ -2054,7 +2060,13 @@ class BookmarkBarViewTest23 : public BookmarkBarViewEventTestBase { ...@@ -2054,7 +2060,13 @@ class BookmarkBarViewTest23 : public BookmarkBarViewEventTestBase {
BookmarkContextMenuNotificationObserver observer_; BookmarkContextMenuNotificationObserver observer_;
}; };
VIEW_TEST(BookmarkBarViewTest23, ContextMenusKeyboard) #if defined(OS_WIN) // Fails on latest versions of Windows.
// https://crbug.com/1108551.
#define MAYBE_ContextMenusKeyboard DISABLED_ContextMenusKeyboard
#else
#define MAYBE_ContextMenusKeyboard ContextMenusKeyboard
#endif
VIEW_TEST(BookmarkBarViewTest23, MAYBE_ContextMenusKeyboard)
// Test that pressing escape on a menu opened via the keyboard dismisses the // Test that pressing escape on a menu opened via the keyboard dismisses the
// context menu but not the parent menu. // context menu but not the parent menu.
...@@ -2130,7 +2142,13 @@ class BookmarkBarViewTest24 : public BookmarkBarViewEventTestBase { ...@@ -2130,7 +2142,13 @@ class BookmarkBarViewTest24 : public BookmarkBarViewEventTestBase {
BookmarkContextMenuNotificationObserver observer_; BookmarkContextMenuNotificationObserver observer_;
}; };
VIEW_TEST(BookmarkBarViewTest24, ContextMenusKeyboardEscape) #if defined(OS_WIN) // Fails on latest versions of Windows.
// https://crbug.com/1108551.
#define MAYBE_ContextMenusKeyboardEscape DISABLED_ContextMenusKeyboardEscape
#else
#define MAYBE_ContextMenusKeyboardEscape ContextMenusKeyboardEscape
#endif
VIEW_TEST(BookmarkBarViewTest24, MAYBE_ContextMenusKeyboardEscape)
#if defined(OS_WIN) #if defined(OS_WIN)
// Tests that pressing the key KEYCODE closes the menu. // Tests that pressing the key KEYCODE closes the menu.
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include "base/run_loop.h" #include "base/run_loop.h"
#include "base/win/windows_version.h" #include "base/win/windows_version.h"
#include "build/build_config.h"
#include "chrome/browser/ui/views/test/view_event_test_base.h" #include "chrome/browser/ui/views/test/view_event_test_base.h"
#include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile.h"
#include "ui/aura/env.h" #include "ui/aura/env.h"
...@@ -192,7 +193,15 @@ class TouchEventsViewTest : public ViewEventTestBase { ...@@ -192,7 +193,15 @@ class TouchEventsViewTest : public ViewEventTestBase {
DISALLOW_COPY_AND_ASSIGN(TouchEventsViewTest); DISALLOW_COPY_AND_ASSIGN(TouchEventsViewTest);
}; };
VIEW_TEST(TouchEventsViewTest, CheckWindowsNativeMessageForTouchEvents) #if defined(OS_WIN) // Fails on latest versions of Windows.
// https://crbug.com/1108551.
#define MAYBE_CheckWindowsNativeMessageForTouchEvents \
DISABLED_CheckWindowsNativeMessageForTouchEvents
#else
#define MAYBE_CheckWindowsNativeMessageForTouchEvents \
CheckWindowsNativeMessageForTouchEvents
#endif
VIEW_TEST(TouchEventsViewTest, MAYBE_CheckWindowsNativeMessageForTouchEvents)
class TouchEventsRecursiveViewTest : public TouchEventsViewTest { class TouchEventsRecursiveViewTest : public TouchEventsViewTest {
public: public:
...@@ -231,4 +240,10 @@ class TouchEventsRecursiveViewTest : public TouchEventsViewTest { ...@@ -231,4 +240,10 @@ class TouchEventsRecursiveViewTest : public TouchEventsViewTest {
DISALLOW_COPY_AND_ASSIGN(TouchEventsRecursiveViewTest); DISALLOW_COPY_AND_ASSIGN(TouchEventsRecursiveViewTest);
}; };
VIEW_TEST(TouchEventsRecursiveViewTest, CheckWindowsRecursiveHandler) #if defined(OS_WIN) // Fails on latest versions of Windows.
// https://crbug.com/1108551.
#define MAYBE_CheckWindowsRecursiveHandler DISABLED_CheckWindowsRecursiveHandler
#else
#define MAYBE_CheckWindowsRecursiveHandler CheckWindowsRecursiveHandler
#endif
VIEW_TEST(TouchEventsRecursiveViewTest, MAYBE_CheckWindowsRecursiveHandler)
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