diff options
| author | Iain Merrick <husky@google.com> | 2010-11-01 12:19:54 +0000 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-11-03 10:21:10 +0000 |
| commit | 731df977c0511bca2206b5f333555b1205ff1f43 (patch) | |
| tree | 0e750b949b3f00a1ac11fda25d3c2de512f2b465 /webkit/glue/resource_fetcher_unittest.cc | |
| parent | 5add15e10e7bb80512f2c597ca57221314abe577 (diff) | |
| download | external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.zip external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.tar.gz external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.tar.bz2 | |
Merge Chromium at r63472 : Initial merge by git.
Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a
Diffstat (limited to 'webkit/glue/resource_fetcher_unittest.cc')
| -rw-r--r-- | webkit/glue/resource_fetcher_unittest.cc | 6 |
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(); |