summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-14 17:59:37 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-14 17:59:37 +0000
commitfdff9e275278af51dfdeda3a3b7462724ebdfe4c (patch)
tree9bcff7050f102fc3adff16a0e7777d99e57f57f0 /webkit
parent03d12f0c42aa5c11673e9b2dcec1d1966fb49589 (diff)
downloadchromium_src-fdff9e275278af51dfdeda3a3b7462724ebdfe4c.zip
chromium_src-fdff9e275278af51dfdeda3a3b7462724ebdfe4c.tar.gz
chromium_src-fdff9e275278af51dfdeda3a3b7462724ebdfe4c.tar.bz2
Flakiness cleanup: disable flaky tests under webkit/
See https://groups.google.com/a/chromium.org/group/chromium-dev/browse_thread/thread/fcec09fc659f39a6 BUG=51622 Review URL: https://chromiumcodereview.appspot.com/9387011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121899 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/resource_fetcher_unittest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/webkit/glue/resource_fetcher_unittest.cc b/webkit/glue/resource_fetcher_unittest.cc
index 784b215..cfc90a3 100644
--- a/webkit/glue/resource_fetcher_unittest.cc
+++ b/webkit/glue/resource_fetcher_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.
@@ -100,7 +100,7 @@ FetcherDelegate* FetcherDelegate::instance_ = NULL;
// Test a fetch from the test server.
// Flaky, http://crbug.com/51622.
-TEST_F(ResourceFetcherTests, FLAKY_ResourceFetcherDownload) {
+TEST_F(ResourceFetcherTests, DISABLED_ResourceFetcherDownload) {
ASSERT_TRUE(test_server_.Start());
WebFrame* frame = test_shell_->webView()->mainFrame();
@@ -132,7 +132,7 @@ TEST_F(ResourceFetcherTests, FLAKY_ResourceFetcherDownload) {
}
// Flaky, http://crbug.com/51622.
-TEST_F(ResourceFetcherTests, FLAKY_ResourceFetcherDidFail) {
+TEST_F(ResourceFetcherTests, DISABLED_ResourceFetcherDidFail) {
ASSERT_TRUE(test_server_.Start());
WebFrame* frame = test_shell_->webView()->mainFrame();