summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authormsw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-06 04:04:45 +0000
committermsw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-06 04:04:45 +0000
commit4b8d4493866c2826c66cf6011dadeafea6eda42a (patch)
treea7a8d5898ebfc87e9807fa8b078b65cd7950a72c /content
parent2a906c0076ac3f7efd17450f12869c7c3429f983 (diff)
downloadchromium_src-4b8d4493866c2826c66cf6011dadeafea6eda42a.zip
chromium_src-4b8d4493866c2826c66cf6011dadeafea6eda42a.tar.gz
chromium_src-4b8d4493866c2826c66cf6011dadeafea6eda42a.tar.bz2
Mark DeviceOrientationProviderTest.ObserverNotRemoved|StartFailing FLAKY on OS_WIN.
http://build.chromium.org/p/chromium/builders/Win7%20Tests%20%283%29/builds/1998/steps/content_unittests/logs/stdio#failure1 http://test-results.appspot.com/dashboards/flakiness_dashboard.html#group=%40DEPS%20-%20chromium.org&testType=content_unittests&tests=DeviceOrientationProviderTest.StartFailing%2CDeviceOrientationProviderTest.ObserverNotRemoved BUG=104950 TEST=NONE TBR=hans,rsleevi Review URL: http://codereview.chromium.org/9110023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116645 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/device_orientation/provider_unittest.cc13
1 files changed, 11 insertions, 2 deletions
diff --git a/content/browser/device_orientation/provider_unittest.cc b/content/browser/device_orientation/provider_unittest.cc
index d1b0951..bcfc175 100644
--- a/content/browser/device_orientation/provider_unittest.cc
+++ b/content/browser/device_orientation/provider_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -251,6 +251,9 @@ TEST_F(DeviceOrientationProviderTest, MultipleObserversPushTest) {
#if defined(OS_LINUX)
// Flakily DCHECKs on Linux. See crbug.com/104950.
#define MAYBE_ObserverNotRemoved DISABLED_ObserverNotRemoved
+#elif defined(OS_WIN)
+// FLAKY on Win. See crbug.com/104950.
+#define MAYBE_ObserverNotRemoved FLAKY_ObserverNotRemoved
#else
#define MAYBE_ObserverNotRemoved ObserverNotRemoved
#endif
@@ -274,7 +277,13 @@ TEST_F(DeviceOrientationProviderTest, MAYBE_ObserverNotRemoved) {
// Note that checker is not removed. This should not be a problem.
}
-TEST_F(DeviceOrientationProviderTest, StartFailing) {
+#if defined(OS_WIN)
+// FLAKY on Win. See crbug.com/104950.
+#define MAYBE_StartFailing FLAKY_StartFailing
+#else
+#define MAYBE_StartFailing StartFailing
+#endif
+TEST_F(DeviceOrientationProviderTest, MAYBE_StartFailing) {
scoped_refptr<MockOrientationFactory> orientation_factory(
new MockOrientationFactory());
Init(MockOrientationFactory::CreateDataFetcher);