summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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.