summaryrefslogtreecommitdiffstats
path: root/chrome/browser/errorpage_uitest.cc
diff options
context:
space:
mode:
authorctguil@chromium.org <ctguil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-14 00:57:07 +0000
committerctguil@chromium.org <ctguil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-14 00:57:07 +0000
commitd9fae8d68dfb9f89bd0309059c8c36d315abc34b (patch)
treef7d25bc89242b3238fd70f102b8dda03d6180906 /chrome/browser/errorpage_uitest.cc
parent13625b8cbae79f23423355850001699a0eb9a499 (diff)
downloadchromium_src-d9fae8d68dfb9f89bd0309059c8c36d315abc34b.zip
chromium_src-d9fae8d68dfb9f89bd0309059c8c36d315abc34b.tar.gz
chromium_src-d9fae8d68dfb9f89bd0309059c8c36d315abc34b.tar.bz2
Mark ErrorPageTest.DNSError_GoBack2Forward2 as flaky on linux x64.
BUG=79412 TEST=none Review URL: http://codereview.chromium.org/6852012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81514 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/errorpage_uitest.cc')
-rw-r--r--chrome/browser/errorpage_uitest.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/errorpage_uitest.cc b/chrome/browser/errorpage_uitest.cc
index 7cf10f0..8cd84d0 100644
--- a/chrome/browser/errorpage_uitest.cc
+++ b/chrome/browser/errorpage_uitest.cc
@@ -101,6 +101,12 @@ TEST_F(ErrorPageTest, DNSError_GoBack2AndForward) {
EXPECT_TRUE(WaitForTitleMatching(L"Mock Link Doctor"));
}
+// Flaky on Linux x64, see http://crbug.com/79412
+#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)
+#define MAYBE_DNSError_GoBack2Forward2 FLAKY_DNSError_GoBack2Forward2
+#else
+#define MAYBE_DNSError_GoBack2Forward2 DNSError_GoBack2Forward2
+#endif
TEST_F(ErrorPageTest, DNSError_GoBack2Forward2) {
// Test that a DNS error occuring in the main frame does not result in an
// additional session history entry.