Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(37)

Unified Diff: ash/shelf/shelf_view_unittest.cc

Issue 2767133002: Makes a couple of overflow button tests early out in mash (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_view_unittest.cc
diff --git a/ash/shelf/shelf_view_unittest.cc b/ash/shelf/shelf_view_unittest.cc
index e6cf81d0e173da373b8cd270407d4f3b40cf1b02..5b374ef2105805552390c501a22cd8cfc8559a0e 100644
--- a/ash/shelf/shelf_view_unittest.cc
+++ b/ash/shelf/shelf_view_unittest.cc
@@ -2669,6 +2669,10 @@ TEST_F(OverflowButtonInkDropTest, MouseContextMenu) {
// Tests ink drop state transitions for the overflow button when the user taps
// on it.
TEST_F(OverflowButtonInkDropTest, TouchActivate) {
+ // TODO: flaky in mash, figure out why. http://crbug.com/696769.
+ if (WmShell::Get()->IsRunningInMash())
+ return;
+
ui::test::EventGenerator& generator = GetEventGenerator();
generator.set_current_location(GetScreenPointInsideOverflowButton());
@@ -2851,6 +2855,10 @@ TEST_F(OverflowButtonActiveInkDropTest, MouseDragOut) {
// and the user presses left mouse button on it and drags it out of the button
// bounds and back.
TEST_F(OverflowButtonActiveInkDropTest, MouseDragOutAndBack) {
+ // TODO: flaky in mash, figure out why. http://crbug.com/696769.
+ if (WmShell::Get()->IsRunningInMash())
+ return;
+
ui::test::EventGenerator& generator = GetEventGenerator();
generator.MoveMouseTo(GetScreenPointInsideOverflowButton());
@@ -2927,6 +2935,10 @@ TEST_F(OverflowButtonActiveInkDropTest, TouchDeactivate) {
// Tests ink drop state transitions for the overflow button when it is active
// and the user taps down on it and drags it out of the button bounds.
TEST_F(OverflowButtonActiveInkDropTest, TouchDragOut) {
+ // TODO: flaky in mash, figure out why. http://crbug.com/696769.
+ if (WmShell::Get()->IsRunningInMash())
+ return;
+
ui::test::EventGenerator& generator = GetEventGenerator();
generator.set_current_location(GetScreenPointInsideOverflowButton());
@@ -2954,6 +2966,10 @@ TEST_F(OverflowButtonActiveInkDropTest, TouchDragOut) {
// Tests ink drop state transitions for the overflow button when it is active
// and the user taps down on it and drags it out of the button bounds and back.
TEST_F(OverflowButtonActiveInkDropTest, TouchDragOutAndBack) {
+ // TODO: flaky in mash, figure out why. http://crbug.com/696769.
+ if (WmShell::Get()->IsRunningInMash())
+ return;
+
ui::test::EventGenerator& generator = GetEventGenerator();
generator.set_current_location(GetScreenPointInsideOverflowButton());
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698