diff options
| author | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-09 22:13:39 +0000 |
|---|---|---|
| committer | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-09 22:13:39 +0000 |
| commit | 058fce356de2240c29a9acd7a1f4e76f9a7a65d8 (patch) | |
| tree | 1666b68ffba1e6ca5ba5dee2d966e5829eeff5b6 /chrome/browser/errorpage_browsertest.cc | |
| parent | 1029de9f77581e660d5bc114c73c77e6461e91b7 (diff) | |
| download | chromium_src-058fce356de2240c29a9acd7a1f4e76f9a7a65d8.zip chromium_src-058fce356de2240c29a9acd7a1f4e76f9a7a65d8.tar.gz chromium_src-058fce356de2240c29a9acd7a1f4e76f9a7a65d8.tar.bz2 | |
Mark ErrorPageTest.DNSError_GoBack2 as flaky in Aura
R=dbeam@chromium.org
TBR=mmenke@chromium.org
BUG=109669
TEST=ErrorPageTest.DNSError_GoBack2
Review URL: http://codereview.chromium.org/9138008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116923 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/errorpage_browsertest.cc')
| -rw-r--r-- | chrome/browser/errorpage_browsertest.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/errorpage_browsertest.cc b/chrome/browser/errorpage_browsertest.cc index 4ecc62f..65ae300 100644 --- a/chrome/browser/errorpage_browsertest.cc +++ b/chrome/browser/errorpage_browsertest.cc @@ -120,9 +120,15 @@ IN_PROC_BROWSER_TEST_F(ErrorPageTest, DNSError_GoBack1) { GoBackAndWaitForTitle("Title Of Awesomeness", 1); } +// See crbug.com/109669 +#if defined(USE_AURA) +#define MAYBE_DNSError_GoBack2 FLAKY_DNSError_GoBack2 +#else +#define MAYBE_DNSError_GoBack2 DNSError_GoBack2 +#endif // Test that a DNS error occuring in the main frame does not result in an // additional session history entry. -IN_PROC_BROWSER_TEST_F(ErrorPageTest, DNSError_GoBack2) { +IN_PROC_BROWSER_TEST_F(ErrorPageTest, MAYBE_DNSError_GoBack2) { GURL test_url(URLRequestFailedDnsJob::kTestUrl); NavigateToFileURL(FILE_PATH_LITERAL("title2.html")); |