summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_focus_uitest.cc
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-31 20:39:19 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-31 20:39:19 +0000
commit0e7c82ed394c9bb23ba0dd37fd0ff338cb9879d1 (patch)
treece5f958d76f817994b2d6d3b4369773dbb43da02 /chrome/browser/browser_focus_uitest.cc
parentdd6583ad11e05fd1333f7bffcc17dc1b27370770 (diff)
downloadchromium_src-0e7c82ed394c9bb23ba0dd37fd0ff338cb9879d1.zip
chromium_src-0e7c82ed394c9bb23ba0dd37fd0ff338cb9879d1.tar.gz
chromium_src-0e7c82ed394c9bb23ba0dd37fd0ff338cb9879d1.tar.bz2
Disable BrowserFocusTest.FocusOnReloadCrashedTab on Linux and ChromeOS.
We just caught a failure on it on Linux/views (timeout). BUG=50025 TEST=interactive_ui_tests Review URL: http://codereview.chromium.org/3284007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58059 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_focus_uitest.cc')
-rw-r--r--chrome/browser/browser_focus_uitest.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc
index 7c28705..12515f7 100644
--- a/chrome/browser/browser_focus_uitest.cc
+++ b/chrome/browser/browser_focus_uitest.cc
@@ -786,9 +786,8 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FocusOnReload) {
ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW));
}
-// FocusOnReloadCrashedTab times out often on chromium os debug build.
-// http://crbug.com/50025
-#if defined(OS_CHROMEOS) && !defined(NDEBUG)
+#if (defined(OS_CHROMEOS) || defined(OS_LINUX)) && !defined(NDEBUG)
+// Hangy, http://crbug.com/50025.
#define MAYBE_FocusOnReloadCrashedTab DISABLED_FocusOnReloadCrashedTab
#else
#define MAYBE_FocusOnReloadCrashedTab FocusOnReloadCrashedTab