summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcsilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-08 01:22:41 +0000
committercsilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-08 01:22:41 +0000
commit604cdea345f1a0c0b76dfb800b582ddc272b23e1 (patch)
treeaa4b8e96d6548445e3a18cebf9fbcf52897bc4e2
parentc12943a32727435d0a83eb464a19d4176917f6bb (diff)
downloadchromium_src-604cdea345f1a0c0b76dfb800b582ddc272b23e1.zip
chromium_src-604cdea345f1a0c0b76dfb800b582ddc272b23e1.tar.gz
chromium_src-604cdea345f1a0c0b76dfb800b582ddc272b23e1.tar.bz2
Mark TwoCommandsOneTab test as FLAKY until it can be fixed.
TBR=jhawkins BUG=48521 TEST=unit tests no longer red due to this change. Review URL: http://codereview.chromium.org/2897001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51811 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/dom_ui/options_ui_uitest.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/dom_ui/options_ui_uitest.cc b/chrome/browser/dom_ui/options_ui_uitest.cc
index 4ec4277..8c55046 100644
--- a/chrome/browser/dom_ui/options_ui_uitest.cc
+++ b/chrome/browser/dom_ui/options_ui_uitest.cc
@@ -58,6 +58,7 @@ TEST_F(OptionsUITest, CommandOpensOptionsTab) {
AssertIsOptionsPage(tab);
}
+// TODO(csilv): Investigate why this fails and fix. http://crbug.com/48521
TEST_F(OptionsUITest, FAILS_CommandAgainGoesBackToOptionsTab) {
scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
ASSERT_TRUE(browser.get());
@@ -86,7 +87,9 @@ TEST_F(OptionsUITest, FAILS_CommandAgainGoesBackToOptionsTab) {
ASSERT_EQ(2, tab_count);
}
-TEST_F(OptionsUITest, TwoCommandsOneTab) {
+// TODO(csilv): Investigate why this fails (sometimes) on 10.5 and fix.
+// http://crbug.com/48521
+TEST_F(OptionsUITest, FLAKY_TwoCommandsOneTab) {
scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
ASSERT_TRUE(browser.get());