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

Unified Diff: chrome/browser/ui/views/menu_item_view_test.cc

Issue 10409027: Disable or mark flaky several UI tests on Win (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Updated Created 8 years, 7 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
Index: chrome/browser/ui/views/menu_item_view_test.cc
diff --git a/chrome/browser/ui/views/menu_item_view_test.cc b/chrome/browser/ui/views/menu_item_view_test.cc
index cc75dd915b45a2a1dc0a48aa3a70e79cade5052b..8ab1500ec57e430aaa87b58bdf1310efb6316bf4 100644
--- a/chrome/browser/ui/views/menu_item_view_test.cc
+++ b/chrome/browser/ui/views/menu_item_view_test.cc
@@ -162,9 +162,18 @@ class MenuItemViewTestBasic : public MenuItemViewTestBase {
typedef MenuItemViewTestBasic<0> MenuItemViewTestBasic0;
typedef MenuItemViewTestBasic<1> MenuItemViewTestBasic1;
typedef MenuItemViewTestBasic<2> MenuItemViewTestBasic2;
-VIEW_TEST(MenuItemViewTestBasic0, SelectItem0)
-VIEW_TEST(MenuItemViewTestBasic1, SelectItem1)
-VIEW_TEST(MenuItemViewTestBasic2, SelectItem2)
+#if defined(OS_WIN)
+#define MAYBE_SelectItem0 DISABLED_SelectItem0
+#define MAYBE_SelectItem1 DISABLED_SelectItem1
+#define MAYBE_SelectItem2 DISABLED_SelectItem2
+#else
+#define MAYBE_SelectItem0 SelectItem0
+#define MAYBE_SelectItem1 SelectItem1
+#define MAYBE_SelectItem2 SelectItem2
+#endif
+VIEW_TEST(MenuItemViewTestBasic0, MAYBE_SelectItem0)
+VIEW_TEST(MenuItemViewTestBasic1, MAYBE_SelectItem1)
+VIEW_TEST(MenuItemViewTestBasic2, MAYBE_SelectItem2)
// Test class for inserting a menu item while the menu is open.
template<int INSERT_INDEX, int SELECT_INDEX>
« no previous file with comments | « chrome/browser/ui/views/find_bar_host_interactive_uitest.cc ('k') | chrome/browser/ui/views/menu_model_adapter_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698