diff options
| author | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-05 15:51:26 +0000 |
|---|---|---|
| committer | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-05 15:51:26 +0000 |
| commit | 4ffba324bd7260b05907bb9ac9c44123635ffd80 (patch) | |
| tree | 1b4c8a7086ed1da387ca9c01a648c8b9586a6c90 | |
| parent | aaa688057357f668c56e83411dc97c13c71327fb (diff) | |
| download | chromium_src-4ffba324bd7260b05907bb9ac9c44123635ffd80.zip chromium_src-4ffba324bd7260b05907bb9ac9c44123635ffd80.tar.gz chromium_src-4ffba324bd7260b05907bb9ac9c44123635ffd80.tar.bz2 | |
Disable ErrorPageTest.IFrameDNSError_GoBack* on Windows. It is flaky on win_rel trybots.
BUG=121540
TEST=ErrorPageTest.IFrameDNSError_GoBack*
TBR=mmenke@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9990010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130933 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/errorpage_browsertest.cc | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/chrome/browser/errorpage_browsertest.cc b/chrome/browser/errorpage_browsertest.cc index e8f3ff8..9232904 100644 --- a/chrome/browser/errorpage_browsertest.cc +++ b/chrome/browser/errorpage_browsertest.cc @@ -198,17 +198,29 @@ IN_PROC_BROWSER_TEST_F(ErrorPageTest, IFrameDNSError_Basic) { 1); } +// This test fails regularly on win_rel trybots. See crbug.com/121540 +#if defined(OS_WIN) +#define MAYBE_IFrameDNSError_GoBack DISABLED_IFrameDNSError_GoBack +#else +#define MAYBE_IFrameDNSError_GoBack IFrameDNSError_GoBack +#endif // Test that a DNS error occuring in an iframe does not result in an // additional session history entry. -IN_PROC_BROWSER_TEST_F(ErrorPageTest, IFrameDNSError_GoBack) { +IN_PROC_BROWSER_TEST_F(ErrorPageTest, MAYBE_IFrameDNSError_GoBack) { NavigateToFileURL(FILE_PATH_LITERAL("title2.html")); NavigateToFileURL(FILE_PATH_LITERAL("iframe_dns_error.html")); GoBackAndWaitForTitle("Title Of Awesomeness", 1); } +// This test fails regularly on win_rel trybots. See crbug.com/121540 +#if defined(OS_WIN) +#define MAYBE_IFrameDNSError_GoBackAndForward DISABLED_IFrameDNSError_GoBackAndForward +#else +#define MAYBE_IFrameDNSError_GoBackAndForward IFrameDNSError_GoBackAndForward +#endif // Test that a DNS error occuring in an iframe does not result in an // additional session history entry. -IN_PROC_BROWSER_TEST_F(ErrorPageTest, IFrameDNSError_GoBackAndForward) { +IN_PROC_BROWSER_TEST_F(ErrorPageTest, MAYBE_IFrameDNSError_GoBackAndForward) { NavigateToFileURL(FILE_PATH_LITERAL("title2.html")); NavigateToFileURL(FILE_PATH_LITERAL("iframe_dns_error.html")); GoBackAndWaitForTitle("Title Of Awesomeness", 1); |