summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorasvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-05 15:29:12 +0000
committerasvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-05 15:29:12 +0000
commit4b649887e1241a43c0d2a1cd81a8867d1be46b49 (patch)
tree58921b44fed6d65b5d9844bcc35a0a0e713d9870
parentc247b5158f9aaa01b256ae1e0fe4920e65b2f095 (diff)
downloadchromium_src-4b649887e1241a43c0d2a1cd81a8867d1be46b49.zip
chromium_src-4b649887e1241a43c0d2a1cd81a8867d1be46b49.tar.gz
chromium_src-4b649887e1241a43c0d2a1cd81a8867d1be46b49.tar.bz2
Mark WebUIBidiCheckerBrowserTestRTL.TestDownloadsPageRTL as flaky on Linux.
Also, disambiguate test names of TestDownloadsPageRTL and TestDownloadsPageLTR. TBR=ofri@chromium.org BUG=109262 Review URL: http://codereview.chromium.org/9116005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116489 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/webui/bidi_checker_web_ui_test.cc18
1 files changed, 14 insertions, 4 deletions
diff --git a/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc b/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc
index c845ca5..0542a92 100644
--- a/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc
+++ b/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -176,13 +176,23 @@ IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL, TestCrashesPage) {
#if defined(OS_WIN) || defined(OS_LINUX)
// http://crbug.com/104129
-#define TestDownloadsPageLTR FLAKY_TestDownloadsPage
+#define MAYBE_TestDownloadsPageLTR FLAKY_TestDownloadsPageLTR
+#else
+#define MAYBE_TestDownloadsPageLTR TestDownloadsPageLTR
#endif
-IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR, TestDownloadsPageLTR) {
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR,
+ MAYBE_TestDownloadsPageLTR) {
RunBidiCheckerOnPage(chrome::kChromeUIDownloadsURL);
}
-IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL, TestDownloadsPage) {
+#if defined(OS_LINUX)
+// http://crbug.com/109262
+#define MAYBE_TestDownloadsPageRTL FLAKY_TestDownloadsPageRTL
+#else
+#define MAYBE_TestDownloadsPageRTL TestDownloadsPageRTL
+#endif
+IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL,
+ MAYBE_TestDownloadsPageRTL) {
RunBidiCheckerOnPage(chrome::kChromeUIDownloadsURL);
}