summaryrefslogtreecommitdiffstats
path: root/ash/display
diff options
context:
space:
mode:
authorrbyers@chromium.org <rbyers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-19 21:18:50 +0000
committerrbyers@chromium.org <rbyers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-19 21:18:50 +0000
commit6f6025dc030e883a59d0fcd626c629eb43bc3eea (patch)
treefa4d411b2823f7a7b68047e30ce463ffb35c52fc /ash/display
parent41291f6a3c414402f491b2632686b044e44e7143 (diff)
downloadchromium_src-6f6025dc030e883a59d0fcd626c629eb43bc3eea.zip
chromium_src-6f6025dc030e883a59d0fcd626c629eb43bc3eea.tar.gz
chromium_src-6f6025dc030e883a59d0fcd626c629eb43bc3eea.tar.bz2
Disable ash_unittest DisplayControllerTest.SecondaryDisplayLayout
This test flaked twice today on two different bots. Passed 100x on re-run on my machine. BUG=161857 TBR=oshima@chromium.org Review URL: https://codereview.chromium.org/11419075 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168605 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/display')
-rw-r--r--ash/display/display_controller_unittest.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/display/display_controller_unittest.cc b/ash/display/display_controller_unittest.cc
index 0ff6283..f0956ee 100644
--- a/ash/display/display_controller_unittest.cc
+++ b/ash/display/display_controller_unittest.cc
@@ -104,7 +104,8 @@ TEST_F(DisplayControllerShutdownTest, MAYBE_Shutdown) {
UpdateDisplay("444x333, 200x200");
}
-TEST_F(DisplayControllerTest, MAYBE_SecondaryDisplayLayout) {
+// Flaky - crbug.com/161857
+TEST_F(DisplayControllerTest, DISABLED_SecondaryDisplayLayout) {
TestObserver observer;
UpdateDisplay("500x500,400x400");
EXPECT_EQ(2, observer.CountAndReset()); // resize and add