diff options
| author | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 15:54:31 +0000 |
|---|---|---|
| committer | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 15:54:31 +0000 |
| commit | 825454071e00d5c9ade643995942d7714dd65401 (patch) | |
| tree | 454d5558c40c5944857e5eb39b355a9965b9d1fd /chrome | |
| parent | e414727ea30e03a5d4582bdbba42d67327605273 (diff) | |
| download | chromium_src-825454071e00d5c9ade643995942d7714dd65401.zip chromium_src-825454071e00d5c9ade643995942d7714dd65401.tar.gz chromium_src-825454071e00d5c9ade643995942d7714dd65401.tar.bz2 | |
Mark BrowserTest.FaviconChange as flaky on Mac.
BUG=83828
TEST=NONE
Review URL: http://codereview.chromium.org/7053005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86626 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/browser_browsertest.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/browser_browsertest.cc b/chrome/browser/browser_browsertest.cc index 26172ee..35e6a5b 100644 --- a/chrome/browser/browser_browsertest.cc +++ b/chrome/browser/browser_browsertest.cc @@ -490,8 +490,14 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, EXPECT_EQ(expected_favicon_url.spec(), entry->favicon().url().spec()); } +#if defined(OS_MAC) +// http://crbug.com/83828. On Mac 10.6, the failure rate is 14% +#define MAYBE_FaviconChange FLAKY_FaviconChange +#else +#define MAYBE_FaviconChange FaviconChange +#endif // Test that an icon can be changed from JS. -IN_PROC_BROWSER_TEST_F(BrowserTest, FaviconChange) { +IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_FaviconChange) { static const FilePath::CharType* kFile = FILE_PATH_LITERAL("onload_change_favicon.html"); GURL file_url(ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory), |