summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-09 18:31:07 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-09 18:31:07 +0000
commitc9292867a14e99196b4436dfa33242fb3ec74fe8 (patch)
treef97d180b7524ba61d19c73d0e8b992869496f417
parentfa59c1272e525ea1c3bc7ab91932e47940ae0f6f (diff)
downloadchromium_src-c9292867a14e99196b4436dfa33242fb3ec74fe8.zip
chromium_src-c9292867a14e99196b4436dfa33242fb3ec74fe8.tar.gz
chromium_src-c9292867a14e99196b4436dfa33242fb3ec74fe8.tar.bz2
Mark following tests as flaky:
- BrowserFocusTest.TabsRememberFocusFindInPage - BrowserFocusTest.BackgroundBrowserDontStealFocus - BrowserFocusTest.TabInitialFocus TBR=estade, jcivelli BUG=62537, 62538, 62539 TEST=interactive_ui_tests Review URL: http://codereview.chromium.org/4736003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65554 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/browser_focus_uitest.cc10
1 files changed, 7 insertions, 3 deletions
diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc
index d9771db..4048885 100644
--- a/chrome/browser/browser_focus_uitest.cc
+++ b/chrome/browser/browser_focus_uitest.cc
@@ -55,7 +55,8 @@
#elif defined(OS_WIN)
#define MAYBE_FocusTraversal FocusTraversal
#define MAYBE_FocusTraversalOnInterstitial FocusTraversalOnInterstitial
-#define MAYBE_TabsRememberFocusFindInPage TabsRememberFocusFindInPage
+// Flaky, http://crbug.com/62537.
+#define MAYBE_TabsRememberFocusFindInPage FLAKY_TabsRememberFocusFindInPage
#endif
namespace {
@@ -314,7 +315,9 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_TabsRememberFocusFindInPage) {
}
// Background window does not steal focus.
-IN_PROC_BROWSER_TEST_F(BrowserFocusTest, BackgroundBrowserDontStealFocus) {
+// Flaky, http://crbug.com/62538.
+IN_PROC_BROWSER_TEST_F(BrowserFocusTest,
+ FLAKY_BackgroundBrowserDontStealFocus) {
ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
ASSERT_TRUE(test_server()->Start());
@@ -700,7 +703,8 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FindFocusTest) {
// Makes sure the focus is in the right location when opening the different
// types of tabs.
-IN_PROC_BROWSER_TEST_F(BrowserFocusTest, TabInitialFocus) {
+// Flaky, http://crbug.com/62539.
+IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FLAKY_TabInitialFocus) {
ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
// Open the history tab, focus should be on the tab contents.