summaryrefslogtreecommitdiffstats
path: root/chrome/browser/errorpage_uitest.cc
diff options
context:
space:
mode:
authortim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-21 04:02:03 +0000
committertim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-21 04:02:03 +0000
commit150b0549fc50eec51e68f1c1cdf0d43be0fa2716 (patch)
tree45cdaa74a0450285cb52cea2dcaeff765394a3ce /chrome/browser/errorpage_uitest.cc
parent9ec27852a63c2d8fbcf4942629532af171f0a312 (diff)
downloadchromium_src-150b0549fc50eec51e68f1c1cdf0d43be0fa2716.zip
chromium_src-150b0549fc50eec51e68f1c1cdf0d43be0fa2716.tar.gz
chromium_src-150b0549fc50eec51e68f1c1cdf0d43be0fa2716.tar.bz2
Mark Page404_GoBack as flaky on linux
TBR=phajdan.jr BUG=19361 TEST=ErrorPageTest Review URL: http://codereview.chromium.org/426011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32733 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 ae33894..56b2e48 100644
--- a/chrome/browser/errorpage_uitest.cc
+++ b/chrome/browser/errorpage_uitest.cc
@@ -243,6 +243,12 @@ TEST_F(ErrorPageTest, Page404) {
EXPECT_TRUE(WaitForTitleMatching(L"Mock Link Doctor"));
}
+#if defined(OS_LINUX)
+// Below explains this is flaky on XP, but it also flakes out on Linux.
+// http://crbug.com/19361
+#define Page404_GoBack FLAKY_Page404_GoBack
+#endif
+
TEST_F(ErrorPageTest, Page404_GoBack) {
#if defined(OS_WIN)
// Flaky on XP, http://crbug.com/19361.