summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-21 20:24:17 +0000
committermark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-21 20:24:17 +0000
commit3b50bd3a2bb00f35e208201b54a1b4d0576c94d9 (patch)
treee2b4924a90c780222a0be56ced28863fa800d0f8
parent9d8c6da308c378adb3236b3723918897aca039e6 (diff)
downloadchromium_src-3b50bd3a2bb00f35e208201b54a1b4d0576c94d9.zip
chromium_src-3b50bd3a2bb00f35e208201b54a1b4d0576c94d9.tar.gz
chromium_src-3b50bd3a2bb00f35e208201b54a1b4d0576c94d9.tar.bz2
Disable ErrorPageTest.Page404 on Linux. It's flaky. ph is working on it.
TEST=yes BUG=19361 Review URL: http://codereview.chromium.org/173219 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24003 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/errorpage_uitest.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/errorpage_uitest.cc b/chrome/browser/errorpage_uitest.cc
index 8a4c3a0..56a6562 100644
--- a/chrome/browser/errorpage_uitest.cc
+++ b/chrome/browser/errorpage_uitest.cc
@@ -157,7 +157,12 @@ TEST_F(ErrorPageTest, IFrame404) {
EXPECT_TRUE(WaitForTitleMatching(L"SUCCESS"));
}
+#if defined(OS_LINUX)
+// TODO(phajdan.jr): This test is flaky on Linux, http://crbug.com/19361
+TEST_F(ErrorPageTest, DISABLED_Page404) {
+#else
TEST_F(ErrorPageTest, Page404) {
+#endif
NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(L"title2.html"));
NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(L"page404.html"));