diff options
| author | dharcourt@chromium.org <dharcourt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-28 20:54:14 +0000 |
|---|---|---|
| committer | dharcourt@chromium.org <dharcourt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-28 20:54:14 +0000 |
| commit | c85e3940ca878b49a3bb1ee8bf48088f113b85d4 (patch) | |
| tree | bbc9c8a0919c8d4e2c0db2a423159fae04655cee /ash/display | |
| parent | 2622feb82a04f568a6700b629fe3b44426ab9935 (diff) | |
| download | chromium_src-c85e3940ca878b49a3bb1ee8bf48088f113b85d4.zip chromium_src-c85e3940ca878b49a3bb1ee8bf48088f113b85d4.tar.gz chromium_src-c85e3940ca878b49a3bb1ee8bf48088f113b85d4.tar.bz2 | |
Disabled flaky DisplayManagerTest.Rotate on Windows.
BUG=244466
TBR=oshima@chromium.org
Review URL: https://chromiumcodereview.appspot.com/15659012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202649 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/display')
| -rw-r--r-- | ash/display/display_manager_unittest.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ash/display/display_manager_unittest.cc b/ash/display/display_manager_unittest.cc index 76475cb..354a73d 100644 --- a/ash/display/display_manager_unittest.cc +++ b/ash/display/display_manager_unittest.cc @@ -702,7 +702,13 @@ TEST_F(DisplayManagerTest, AutomaticOverscanInsets) { GetDisplayInfoAt(1).size_in_pixel().ToString()); } -TEST_F(DisplayManagerTest, Rotate) { +#if defined(OS_WIN) +// Flaky on Win8 Aura: http://crbug.com/244466 +#define MAYBE_Rotate DISABLED_Rotate +#else +#define MAYBE_Rotate Rotate +#endif +TEST_F(DisplayManagerTest, MAYBE_Rotate) { UpdateDisplay("100x200/r,300x400/l"); EXPECT_EQ("1,1 100x200", GetDisplayInfoAt(0).bounds_in_pixel().ToString()); |