summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test/chrome_frame_automation_mock.cc
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-14 20:07:40 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-14 20:07:40 +0000
commitce1402accb9a01358fc1235f1319d934cd611248 (patch)
treebe8dcb05c0b1ff80bb42fc50b08ce752cd441f8b /chrome_frame/test/chrome_frame_automation_mock.cc
parent4af83ae5677fd0b24bc33dcc50f9b07d1e30169b (diff)
downloadchromium_src-ce1402accb9a01358fc1235f1319d934cd611248.zip
chromium_src-ce1402accb9a01358fc1235f1319d934cd611248.tar.gz
chromium_src-ce1402accb9a01358fc1235f1319d934cd611248.tar.bz2
Flakiness cleanup: disable flaky tests under chrome_frame/
See https://groups.google.com/a/chromium.org/group/chromium-dev/browse_thread/thread/fcec09fc659f39a6 BUG=81479,83133,37088,32321,111074,114058,90791,83114,64794 Review URL: http://codereview.chromium.org/9391011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121919 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/chrome_frame_automation_mock.cc')
-rw-r--r--chrome_frame/test/chrome_frame_automation_mock.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome_frame/test/chrome_frame_automation_mock.cc b/chrome_frame/test/chrome_frame_automation_mock.cc
index 966a176..5dce4df 100644
--- a/chrome_frame/test/chrome_frame_automation_mock.cc
+++ b/chrome_frame/test/chrome_frame_automation_mock.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.
@@ -12,7 +12,7 @@ const int kShortWaitTimeout = 5 * 1000;
// This test has been marked as flaky as it randomly times out on the CF
// builders
// http://code.google.com/p/chromium/issues/detail?id=81479
-TEST(ChromeFrame, FLAKY_Launch) {
+TEST(ChromeFrame, DISABLED_Launch) {
MessageLoopForUI loop;
AutomationMockLaunch mock_launch(&loop, kLongWaitTimeout);
@@ -47,7 +47,7 @@ TEST(ChromeFrame, PostMessage) {
// Marking this test as flaky as it fails randomly on the CF builders.
// http://code.google.com/p/chromium/issues/detail?id=81479
-TEST(ChromeFrame, FLAKY_RequestStart) {
+TEST(ChromeFrame, DISABLED_RequestStart) {
MessageLoopForUI loop;
AutomationMockHostNetworkRequestStart mock_request_start(&loop,
kLongWaitTimeout);