summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-14 08:27:50 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-14 08:27:50 +0000
commit62d6150c7a33d208fcff11e2e3622df4c75e0f48 (patch)
tree6e408ee64b97423fa26fac38ada0725de5aff1ff /webkit
parent66d051bb5092e35d36320e6a0fcc3ddb75f16c51 (diff)
downloadchromium_src-62d6150c7a33d208fcff11e2e3622df4c75e0f48.zip
chromium_src-62d6150c7a33d208fcff11e2e3622df4c75e0f48.tar.gz
chromium_src-62d6150c7a33d208fcff11e2e3622df4c75e0f48.tar.bz2
Mark ResourceFetcherTests.ResourceFetcherDownload and ResourceFetcherDidFail as FLAKY
TBR=darin BUG=51622 TEST=test_shell_tests Review URL: http://codereview.chromium.org/3800004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62522 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/resource_fetcher_unittest.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/webkit/glue/resource_fetcher_unittest.cc b/webkit/glue/resource_fetcher_unittest.cc
index 70c316b..3ac004e 100644
--- a/webkit/glue/resource_fetcher_unittest.cc
+++ b/webkit/glue/resource_fetcher_unittest.cc
@@ -149,7 +149,8 @@ class FetcherDelegate {
FetcherDelegate* FetcherDelegate::instance_ = NULL;
// Test a fetch from the test server.
-TEST_F(ResourceFetcherTests, ResourceFetcherDownload) {
+// Flaky, http://crbug.com/51622.
+TEST_F(ResourceFetcherTests, FLAKY_ResourceFetcherDownload) {
ASSERT_TRUE(test_server_.Start());
WebFrame* frame = test_shell_->webView()->mainFrame();
@@ -178,7 +179,8 @@ TEST_F(ResourceFetcherTests, ResourceFetcherDownload) {
EXPECT_TRUE(delegate->data().find("Not Found.") != std::string::npos);
}
-TEST_F(ResourceFetcherTests, ResourceFetcherDidFail) {
+// Flaky, http://crbug.com/51622.
+TEST_F(ResourceFetcherTests, FLAKY_ResourceFetcherDidFail) {
ASSERT_TRUE(test_server_.Start());
WebFrame* frame = test_shell_->webView()->mainFrame();