diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-08 07:48:52 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-08 07:48:52 +0000 |
commit | 4749e49e0166f32158bb2ba1ef8f20666379a60b (patch) | |
tree | cf18a4e8203eaaf5401e248786c35cbbe682aca8 /ash/drag_drop | |
parent | 5052228336bfb53c4b23c4f752e091a7b1e41001 (diff) | |
download | chromium_src-4749e49e0166f32158bb2ba1ef8f20666379a60b.zip chromium_src-4749e49e0166f32158bb2ba1ef8f20666379a60b.tar.gz chromium_src-4749e49e0166f32158bb2ba1ef8f20666379a60b.tar.bz2 |
Disable failing ash_unittests drag drop controller tests on Windows.
These 5 tests:
DragDropControllerTest.DragDropInSingleViewTest
DragDropControllerTest.DragDropInMultipleViewsSingleWidgetTest
DragDropControllerTest.DragDropInMultipleViewsMultipleWidgetsTest
DragDropControllerTest.ViewRemovedWhileInDragDropTest
DragDropControllerTest.PressingEscapeCancelsDragDrop
pass locally but fail on the buildbot.
BUG=154081
TBR=ben
Review URL: https://codereview.chromium.org/11783026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175497 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/drag_drop')
-rw-r--r-- | ash/drag_drop/drag_drop_controller_unittest.cc | 40 |
1 files changed, 35 insertions, 5 deletions
diff --git a/ash/drag_drop/drag_drop_controller_unittest.cc b/ash/drag_drop/drag_drop_controller_unittest.cc index a287ca8..d13415f 100644 --- a/ash/drag_drop/drag_drop_controller_unittest.cc +++ b/ash/drag_drop/drag_drop_controller_unittest.cc @@ -342,7 +342,13 @@ class DragDropControllerTest : public AshTestBase { DISALLOW_COPY_AND_ASSIGN(DragDropControllerTest); }; -TEST_F(DragDropControllerTest, DragDropInSingleViewTest) { +// TODO(win_aura) http://crbug.com/154081 +#if defined(OS_WIN) +#define MAYBE_DragDropInSingleViewTest DISABLED_DragDropInSingleViewTest +#else +#define MAYBE_DragDropInSingleViewTest DragDropInSingleViewTest +#endif +TEST_F(DragDropControllerTest, MAYBE_DragDropInSingleViewTest) { scoped_ptr<views::Widget> widget(CreateNewWidget()); DragTestView* drag_view = new DragTestView; AddViewToWidgetAndResize(widget.get(), drag_view); @@ -426,7 +432,13 @@ TEST_F(DragDropControllerTest, DragDropWithZeroDragUpdates) { EXPECT_TRUE(drag_view->drag_done_received_); } -TEST_F(DragDropControllerTest, DragDropInMultipleViewsSingleWidgetTest) { +// TODO(win_aura) http://crbug.com/154081 +#if defined(OS_WIN) +#define MAYBE_DragDropInMultipleViewsSingleWidgetTest DISABLED_DragDropInMultipleViewsSingleWidgetTest +#else +#define MAYBE_DragDropInMultipleViewsSingleWidgetTest DragDropInMultipleViewsSingleWidgetTest +#endif +TEST_F(DragDropControllerTest, MAYBE_DragDropInMultipleViewsSingleWidgetTest) { scoped_ptr<views::Widget> widget(CreateNewWidget()); DragTestView* drag_view1 = new DragTestView; AddViewToWidgetAndResize(widget.get(), drag_view1); @@ -481,7 +493,13 @@ TEST_F(DragDropControllerTest, DragDropInMultipleViewsSingleWidgetTest) { EXPECT_FALSE(drag_view2->drag_done_received_); } -TEST_F(DragDropControllerTest, DragDropInMultipleViewsMultipleWidgetsTest) { +// TODO(win_aura) http://crbug.com/154081 +#if defined(OS_WIN) +#define MAYBE_DragDropInMultipleViewsMultipleWidgetsTest DISABLED_DragDropInMultipleViewsMultipleWidgetsTest +#else +#define MAYBE_DragDropInMultipleViewsMultipleWidgetsTest DragDropInMultipleViewsMultipleWidgetsTest +#endif +TEST_F(DragDropControllerTest, MAYBE_DragDropInMultipleViewsMultipleWidgetsTest) { scoped_ptr<views::Widget> widget1(CreateNewWidget()); DragTestView* drag_view1 = new DragTestView; AddViewToWidgetAndResize(widget1.get(), drag_view1); @@ -540,7 +558,13 @@ TEST_F(DragDropControllerTest, DragDropInMultipleViewsMultipleWidgetsTest) { EXPECT_FALSE(drag_view2->drag_done_received_); } -TEST_F(DragDropControllerTest, ViewRemovedWhileInDragDropTest) { +// TODO(win_aura) http://crbug.com/154081 +#if defined(OS_WIN) +#define MAYBE_ViewRemovedWhileInDragDropTest DISABLED_ViewRemovedWhileInDragDropTest +#else +#define MAYBE_ViewRemovedWhileInDragDropTest ViewRemovedWhileInDragDropTest +#endif +TEST_F(DragDropControllerTest, MAYBE_ViewRemovedWhileInDragDropTest) { scoped_ptr<views::Widget> widget(CreateNewWidget()); scoped_ptr<DragTestView> drag_view(new DragTestView); AddViewToWidgetAndResize(widget.get(), drag_view.get()); @@ -725,7 +749,13 @@ TEST_F(DragDropControllerTest, SyntheticEventsDuringDragDrop) { EXPECT_TRUE(drag_view->drag_done_received_); } -TEST_F(DragDropControllerTest, PressingEscapeCancelsDragDrop) { +// TODO(win_aura) http://crbug.com/154081 +#if defined(OS_WIN) +#define MAYBE_PressingEscapeCancelsDragDrop DISABLED_PressingEscapeCancelsDragDrop +#else +#define MAYBE_PressingEscapeCancelsDragDrop PressingEscapeCancelsDragDrop +#endif +TEST_F(DragDropControllerTest, MAYBE_PressingEscapeCancelsDragDrop) { scoped_ptr<views::Widget> widget(CreateNewWidget()); DragTestView* drag_view = new DragTestView; AddViewToWidgetAndResize(widget.get(), drag_view); |