diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-02 22:02:48 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-02 22:02:48 +0000 |
| commit | 065d974a023bfc7bff9e1c3590b797bc0f2738fb (patch) | |
| tree | 02ad4af1112f291f9d08ead7c35c029df5566166 /ash/display | |
| parent | d122cfbfac5f51d322042d2d5d531b51e07f3d2b (diff) | |
| download | chromium_src-065d974a023bfc7bff9e1c3590b797bc0f2738fb.zip chromium_src-065d974a023bfc7bff9e1c3590b797bc0f2738fb.tar.gz chromium_src-065d974a023bfc7bff9e1c3590b797bc0f2738fb.tar.bz2 | |
Disable DisplayControllerTest.SwapPrimary and SwapPrimaryById on win+aura.
They crash flakily on win8 aura bots.
BUG=237642
TBR=oshima@chromium.org
Review URL: https://codereview.chromium.org/14705007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197980 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/display')
| -rw-r--r-- | ash/display/display_controller_unittest.cc | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/ash/display/display_controller_unittest.cc b/ash/display/display_controller_unittest.cc index c0bbd63..8ac928d 100644 --- a/ash/display/display_controller_unittest.cc +++ b/ash/display/display_controller_unittest.cc @@ -376,7 +376,13 @@ TEST_F(DisplayControllerTest, InvertLayout) { DisplayLayout(DisplayLayout::BOTTOM, -80).Invert().ToString()); } -TEST_F(DisplayControllerTest, SwapPrimary) { +// Crashes flakily on win8 aura bots: crbug.com/237642 +#if defined(OS_WIN) && defined(USE_AURA) +#define MAYBE_SwapPrimary DISABLED_SwapPrimary +#else +#define MAYBE_SwapPrimary SwapPrimary +#endif +TEST_F(DisplayControllerTest, MAYBE_SwapPrimary) { DisplayController* display_controller = Shell::GetInstance()->display_controller(); @@ -468,7 +474,13 @@ TEST_F(DisplayControllerTest, SwapPrimary) { EXPECT_TRUE(primary_root->Contains(launcher_window)); } -TEST_F(DisplayControllerTest, SwapPrimaryById) { +// Crashes flakily on win8 aura bots: crbug.com/237642 +#if defined(OS_WIN) && defined(USE_AURA) +#define MAYBE_SwapPrimaryById DISABLED_SwapPrimaryById +#else +#define MAYBE_SwapPrimaryById SwapPrimaryById +#endif +TEST_F(DisplayControllerTest, MAYBE_SwapPrimaryById) { DisplayController* display_controller = Shell::GetInstance()->display_controller(); |