MacViews: Disable tests in MenuViewDragAndDropTest.

chrome/browser/ui/views/menu_view_drag_and_drop_test.cc

Index: chrome/browser/ui/views/menu_view_drag_and_drop_test.cc
diff --git a/chrome/browser/ui/views/menu_view_drag_and_drop_test.cc b/chrome/browser/ui/views/menu_view_drag_and_drop_test.cc
index 43502da73bbc4195b47e4da448a6d7f9904e6253..a22882afeb742cdcee837c52951e12ab61c17cba 100644
--- a/chrome/browser/ui/views/menu_view_drag_and_drop_test.cc
+++ b/chrome/browser/ui/views/menu_view_drag_and_drop_test.cc
@@ -18,7 +18,9 @@ namespace {
 // Borrowed from chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc,
 // since these are also disabled on Linux for drag and drop.
 // TODO(erg): Fix DND tests on linux_aura. crbug.com/163931
-#if defined(OS_LINUX) && defined(USE_AURA)
+// Windows: Flaky. http://crbug.com/401226
+// MacViews: Enable these tests if they get fixed. https://crbug.com/449058
+#if defined(OS_LINUX) && defined(USE_AURA) || defined(OS_WIN) || defined(OS_MACOSX)

[tapted, 2015/01/15 06:38:07]

Since this is basically #if (true)... we might as well reorganise a bit. This
bit up here feels out of place.

I'd just change the two tests do say DISABLED_TestFoo, but put a comment above
them like

// ...
// to stay open.
// Disabled on all platforms for being flaky. Tracked in:
// TODO(erg): Fix DND tests on linux_aura. http://crbug.com/163931.
// Windows: http://crbug.com/401226.
// TODO(tapted): De-flake and run on Mac https://crbug.com/449058.
VIEW_TEST(MenuViewDragAndDropTestTestInMenuDrag, DISABLED_TestInMenuDrag)

/* ... */
// after the drag.
// Disabled on all platforms for being flaky. Tracked in:
// TODO(erg): Fix DND tests on linux_aura. http://crbug.com/163931.
// Windows: http://crbug.com/401226.
// TODO(tapted): De-flake and run on Mac https://crbug.com/449058.
VIEW_TEST(MenuViewDragAndDropTestNestedDrag, \
    DISABLED_MenuViewDragAndDropNestedDrag)


For mac, I wouldn't say enable these tests if they get fixed. Ideally myself, or
someone, finds time to get the test running on Mac in a non-flaky way, and
investigates de-flaking it on all platforms.

[jackhou1, 2015/01/15 06:53:28]

Done.

 #define MAYBE(x) DISABLED_##x
 #else
 #define MAYBE(x) x
@@ -348,9 +350,7 @@ void MenuViewDragAndDropTestTestInMenuDrag::Step4() {
 // Test that an in-menu (i.e., entirely implemented in the menu code) closes the
 // menu automatically once the drag is complete, and does not ask the delegate
 // to stay open.
-#if !defined(OS_WIN)  // flaky http://crbug.com/401226
 VIEW_TEST(MenuViewDragAndDropTestTestInMenuDrag, MAYBE(TestInMenuDrag))
-#endif
 
 class MenuViewDragAndDropTestNestedDrag : public MenuViewDragAndDropTest {
  public:
@@ -448,10 +448,8 @@ void MenuViewDragAndDropTestNestedDrag::Step4() {
 // Test that a nested drag (i.e. one via a child view, and not entirely
 // implemented in menu code) will consult the delegate before closing the view
 // after the drag.
-#if !defined(OS_WIN)  // http://crbug.com/401226
 VIEW_TEST(MenuViewDragAndDropTestNestedDrag,
           MAYBE(MenuViewDragAndDropNestedDrag))
-#endif
 
 class MenuViewDragAndDropForDropStayOpen : public MenuViewDragAndDropTest {
  public: