diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-16 02:46:25 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-16 02:46:25 +0000 |
| commit | 13cac682638080201b5754833bcbcdb7ecf032ed (patch) | |
| tree | 42ec56068dbea40c145e056e98aebfa1d4642516 /ui/views/widget | |
| parent | 9a3f651a74a2250af546695f833bc3c97a7638b0 (diff) | |
| download | chromium_src-13cac682638080201b5754833bcbcdb7ecf032ed.zip chromium_src-13cac682638080201b5754833bcbcdb7ecf032ed.tar.gz chromium_src-13cac682638080201b5754833bcbcdb7ecf032ed.tar.bz2 | |
Disable flaky test on Windows
Disabling these tests on Windows:
CaptureWidgetFromMousePress and TestRootViewHandlersWhenHidden
BUG=264872
TBR=sandrul@chromium.org
Review URL: https://chromiumcodereview.appspot.com/22852005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217915 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/widget')
| -rw-r--r-- | ui/views/widget/widget_unittest.cc | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/ui/views/widget/widget_unittest.cc b/ui/views/widget/widget_unittest.cc index 1153538..b9e32d6 100644 --- a/ui/views/widget/widget_unittest.cc +++ b/ui/views/widget/widget_unittest.cc @@ -1181,7 +1181,15 @@ TEST_F(WidgetTest, ExitFullscreenRestoreState) { // Checks that if a mouse-press triggers a capture on a different widget (which // consumes the mouse-release event), then the target of the press does not have // capture. -TEST_F(WidgetTest, CaptureWidgetFromMousePress) { +// Fails on chromium.webkit Windows bot, see crbug.com/264872. +#if defined(OS_WIN) +#define MAYBE_DisableCaptureWidgetFromMousePress\ + DISABLED_CaptureWidgetFromMousePress +#else +#define MAYBE_DisableCaptureWidgetFromMousePress\ + CaptureWidgetFromMousePress +#endif +TEST_F(WidgetTest, MAYBE_DisableCaptureWidgetFromMousePress) { // The test creates two widgets: |first| and |second|. // The View in |first| makes |second| visible, sets capture on it, and starts // a nested loop (like a menu does). The View in |second| terminates the @@ -2063,7 +2071,15 @@ class RootViewTestView : public View { }; // Checks if RootView::*_handler_ fields are unset when widget is hidden. -TEST_F(WidgetTest, TestRootViewHandlersWhenHidden) { +// Fails on chromium.webkit Windows bot, see crbug.com/264872. +#if defined(OS_WIN) +#define MAYBE_DisableTestRootViewHandlersWhenHidden\ + DISABLED_TestRootViewHandlersWhenHidden +#else +#define MAYBE_DisableTestRootViewHandlersWhenHidden\ + TestRootViewHandlersWhenHidden +#endif +TEST_F(WidgetTest, MAYBE_DisableTestRootViewHandlersWhenHidden) { Widget* widget = CreateTopLevelNativeWidget(); widget->SetBounds(gfx::Rect(0, 0, 300, 300)); View* view = new RootViewTestView(); |