summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-05 18:32:55 +0000
committerapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-05 18:32:55 +0000
commit066bfa567a00da8cdaf86daf2b88490c0fa6ae9e (patch)
tree1375f4d85edf13413a4771c7d161e8d24a6349ad
parentb59ea313fd719a12140376a8f99409cdcd44d39d (diff)
downloadchromium_src-066bfa567a00da8cdaf86daf2b88490c0fa6ae9e.zip
chromium_src-066bfa567a00da8cdaf86daf2b88490c0fa6ae9e.tar.gz
chromium_src-066bfa567a00da8cdaf86daf2b88490c0fa6ae9e.tar.bz2
Marked BookmarksUITest.CommandAgainGoesBackToBookmarksTab flaky.
BUG=91843 Review URL: http://codereview.chromium.org/7584009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95639 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/webui/bookmarks_ui_uitest.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/ui/webui/bookmarks_ui_uitest.cc b/chrome/browser/ui/webui/bookmarks_ui_uitest.cc
index 26a16bb..1900e8c 100644
--- a/chrome/browser/ui/webui/bookmarks_ui_uitest.cc
+++ b/chrome/browser/ui/webui/bookmarks_ui_uitest.cc
@@ -102,7 +102,14 @@ TEST_F(BookmarksUITest, CommandOpensBookmarksTab) {
AssertIsBookmarksPage(tab);
}
-TEST_F(BookmarksUITest, CommandAgainGoesBackToBookmarksTab) {
+// http://crbug.com/91843
+#if defined(OS_LINUX)
+#define MAYBE_CommandAgainGoesBackToBookmarksTab FLAKY_CommandAgainGoesBackToBookmarksTab
+#else
+#define MAYBE_CommandAgainGoesBackToBookmarksTab CommandAgainGoesBackToBookmarksTab
+#endif
+
+TEST_F(BookmarksUITest, MAYBE_CommandAgainGoesBackToBookmarksTab) {
scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
ASSERT_TRUE(browser.get());