diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-02 18:56:31 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-02 18:56:31 +0000 |
| commit | a5c111f718b7cff9afdf348c05b6d59a8cdeafdc (patch) | |
| tree | e76c30508c40eaebac6083821a293bd187584124 /chrome/browser/errorpage_uitest.cc | |
| parent | d729f42ef46cfe11fdbf17d3a15ce5cf3cbfc948 (diff) | |
| download | chromium_src-a5c111f718b7cff9afdf348c05b6d59a8cdeafdc.zip chromium_src-a5c111f718b7cff9afdf348c05b6d59a8cdeafdc.tar.gz chromium_src-a5c111f718b7cff9afdf348c05b6d59a8cdeafdc.tar.bz2 | |
Marking ErrorPageTest.IFrame404 as flaky on Windows builders, probably related to the test server bugging out occasionally.
BUG=60937
TEST=NONE.
Review URL: http://codereview.chromium.org/4251003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64778 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/errorpage_uitest.cc')
| -rw-r--r-- | chrome/browser/errorpage_uitest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/errorpage_uitest.cc b/chrome/browser/errorpage_uitest.cc index 6446b56..427f067 100644 --- a/chrome/browser/errorpage_uitest.cc +++ b/chrome/browser/errorpage_uitest.cc @@ -163,7 +163,14 @@ TEST_F(ErrorPageTest, IFrameDNSError_GoBackAndForward) { EXPECT_TRUE(WaitForTitleMatching(L"Blah")); } -TEST_F(ErrorPageTest, IFrame404) { +#if defined(OS_WIN) +// Might be related to http://crbug.com/60937 +#define MAYBE_IFrame404 FLAKY_IFrame404 +#else +#define MAYBE_IFrame404 IFrame404 +#endif + +TEST_F(ErrorPageTest, MAYBE_IFrame404) { // iframes that have 404 pages should not trigger an alternate error page. // In this test, the iframe sets the title of the parent page to "SUCCESS" // when the iframe loads. If the iframe fails to load (because an alternate |