diff options
| author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-25 07:17:41 +0000 |
|---|---|---|
| committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-25 07:17:41 +0000 |
| commit | c918fadf42d42683cfd1366f6ff356a867d104b1 (patch) | |
| tree | f93a8e1353f3b1eaca2db0341df09a187e82118f /chrome/browser | |
| parent | a991b81ca433bdbb0e5216987230df477e53a777 (diff) | |
| download | chromium_src-c918fadf42d42683cfd1366f6ff356a867d104b1.zip chromium_src-c918fadf42d42683cfd1366f6ff356a867d104b1.tar.gz chromium_src-c918fadf42d42683cfd1366f6ff356a867d104b1.tar.bz2 | |
Relanding this, it was failing to compile because of a FRIEND_CHANGE that had not been updated with the test disabled name.
Disabling 2 browser tests that fail on the build-bot:
ExtensionShelfModelTest.Basic
WebCacheManagerBrowserTest.CrashOnceOnly
BUG=None
TEST=None
TBR=erikkay,jam
Review URL: http://codereview.chromium.org/147140
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19236 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
3 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extension_shelf_model_unittest.cc b/chrome/browser/extensions/extension_shelf_model_unittest.cc index eaddab8..d4add7d 100644 --- a/chrome/browser/extensions/extension_shelf_model_unittest.cc +++ b/chrome/browser/extensions/extension_shelf_model_unittest.cc @@ -73,7 +73,8 @@ class ExtensionShelfModelTest : public InProcessBrowserTest, int moved_count_; }; -IN_PROC_BROWSER_TEST_F(ExtensionShelfModelTest, Basic) { +// TODO(erikkay): http://crbug.com/15291 disabled because fails on build-bot. +IN_PROC_BROWSER_TEST_F(ExtensionShelfModelTest, DISABLED_Basic) { // Get the path to our extension. FilePath path; ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &path)); diff --git a/chrome/browser/renderer_host/web_cache_manager.h b/chrome/browser/renderer_host/web_cache_manager.h index 8de934f..333aeb2 100644 --- a/chrome/browser/renderer_host/web_cache_manager.h +++ b/chrome/browser/renderer_host/web_cache_manager.h @@ -25,7 +25,7 @@ class PrefService; class WebCacheManager { // Unit tests are our friends. friend class WebCacheManagerTest; - FRIEND_TEST(WebCacheManagerBrowserTest, CrashOnceOnly); + FRIEND_TEST(WebCacheManagerBrowserTest, DISABLED_CrashOnceOnly); public: static void RegisterPrefs(PrefService* prefs); diff --git a/chrome/browser/renderer_host/web_cache_manager_browser_test.cc b/chrome/browser/renderer_host/web_cache_manager_browser_test.cc index d3826a6..bd4069e 100644 --- a/chrome/browser/renderer_host/web_cache_manager_browser_test.cc +++ b/chrome/browser/renderer_host/web_cache_manager_browser_test.cc @@ -18,7 +18,8 @@ class WebCacheManagerBrowserTest : public InProcessBrowserTest { // Regression test for http://crbug.com/12362. If a renderer crashes and the // user navigates to another tab and back, the browser doesn't crash. -IN_PROC_BROWSER_TEST_F(WebCacheManagerBrowserTest, CrashOnceOnly) { +// TODO(jam): http://crbug.com/15288 disabled because it fails on the build bot. +IN_PROC_BROWSER_TEST_F(WebCacheManagerBrowserTest, DISABLED_CrashOnceOnly) { GURL url(ui_test_utils::GetTestUrl(L"google", L"google.html")); ui_test_utils::NavigateToURL(browser(), url); |