diff options
author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-22 07:24:48 +0000 |
---|---|---|
committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-22 07:24:48 +0000 |
commit | a5eb2d67490a81149cd03a7415c8b0628d067fd4 (patch) | |
tree | c2956168d8faf4b94fee1144c819a220cd2a3351 | |
parent | a342ce140673b2a40e400862b385dd6e42ded4b0 (diff) | |
download | chromium_src-a5eb2d67490a81149cd03a7415c8b0628d067fd4.zip chromium_src-a5eb2d67490a81149cd03a7415c8b0628d067fd4.tar.gz chromium_src-a5eb2d67490a81149cd03a7415c8b0628d067fd4.tar.bz2 |
GTTF: Disable crashing/hanging tests:
- MouseLeaveTest.TestOnMouseOut (issue 45892)
- BrowserFocusTest.FocusTraversal (issue 49738)
- BrowserFocusTest.FocusTraversalOnInterstitial (issue 49738)
- ExtensionApiTest.TabOnRemoved (issue 59198)
- ExtensionBrowserTest.PluginLoadUnload (issue 47598)
- ExtensionApiTest.WindowOpen (issue 60156)
TBR=nkostylev
BUG=45892, 49738, 59198, 60156
TEST=none
Review URL: http://codereview.chromium.org/4029005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63492 0039d316-1c4b-4281-b951-d872f2087c98
5 files changed, 7 insertions, 12 deletions
diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc index ea679674..4f6dfa3 100644 --- a/chrome/browser/browser_focus_uitest.cc +++ b/chrome/browser/browser_focus_uitest.cc @@ -48,8 +48,8 @@ #define MAYBE_TabsRememberFocusFindInPage FAILS_TabsRememberFocusFindInPage #elif defined(OS_MACOSX) // TODO(suzhe): http://crbug.com/49738 (following two tests) -#define MAYBE_FocusTraversal FAILS_FocusTraversal -#define MAYBE_FocusTraversalOnInterstitial FAILS_FocusTraversalOnInterstitial +#define MAYBE_FocusTraversal DISABLED_FocusTraversal +#define MAYBE_FocusTraversalOnInterstitial DISABLED_FocusTraversalOnInterstitial // TODO(suzhe): http://crbug.com/49737 #define MAYBE_TabsRememberFocusFindInPage FAILS_TabsRememberFocusFindInPage #elif defined(OS_WIN) diff --git a/chrome/browser/extensions/extension_browsertests_misc.cc b/chrome/browser/extensions/extension_browsertests_misc.cc index 8338a52..903e0ff 100644 --- a/chrome/browser/extensions/extension_browsertests_misc.cc +++ b/chrome/browser/extensions/extension_browsertests_misc.cc @@ -701,7 +701,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, WindowOpenNoPrivileges) { #define MAYBE_PluginLoadUnload PluginLoadUnload #elif defined(OS_LINUX) // http://crbug.com/47598 -#define MAYBE_PluginLoadUnload FLAKY_PluginLoadUnload +#define MAYBE_PluginLoadUnload DISABLED_PluginLoadUnload #else // TODO(mpcomplete): http://crbug.com/29900 need cross platform plugin support. #define MAYBE_PluginLoadUnload DISABLED_PluginLoadUnload diff --git a/chrome/browser/extensions/extension_tabs_apitest.cc b/chrome/browser/extensions/extension_tabs_apitest.cc index df108f3..cf7bd38 100644 --- a/chrome/browser/extensions/extension_tabs_apitest.cc +++ b/chrome/browser/extensions/extension_tabs_apitest.cc @@ -19,7 +19,7 @@ // Possible race in ChromeURLDataManager. http://crbug.com/59198 #if defined(OS_MACOSX) || defined(OS_LINUX) -#define MAYBE_TabOnRemoved FLAKY_TabOnRemoved +#define MAYBE_TabOnRemoved DISABLED_TabOnRemoved #else #define MAYBE_TabOnRemoved TabOnRemoved #endif diff --git a/chrome/browser/extensions/window_open_apitest.cc b/chrome/browser/extensions/window_open_apitest.cc index 27c1b96f..f0ef19c 100644 --- a/chrome/browser/extensions/window_open_apitest.cc +++ b/chrome/browser/extensions/window_open_apitest.cc @@ -11,13 +11,8 @@ #include "chrome/test/ui_test_utils.h" #include "net/base/mock_host_resolver.h" -// crbug.com/60156 -#if defined(OS_MACOSX) -// On mac, this test basically never succeeds. -#define FLAKY_WindowOpen DISABLED_WindowOpen -#endif - -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FLAKY_WindowOpen) { +// Disabled, http://crbug.com/60156 +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_WindowOpen) { CommandLine::ForCurrentProcess()->AppendSwitch( switches::kEnableExperimentalExtensionApis); diff --git a/chrome/test/interactive_ui/mouseleave_interactive_uitest.cc b/chrome/test/interactive_ui/mouseleave_interactive_uitest.cc index 41458c3..627e25e 100644 --- a/chrome/test/interactive_ui/mouseleave_interactive_uitest.cc +++ b/chrome/test/interactive_ui/mouseleave_interactive_uitest.cc @@ -26,7 +26,7 @@ class MouseLeaveTest : public UITest { #if defined(OS_MACOSX) // Missing automation provider support: http://crbug.com/45892 -#define MAYBE_TestOnMouseOut FAILS_TestOnMouseOut +#define MAYBE_TestOnMouseOut DISABLED_TestOnMouseOut #else #define MAYBE_TestOnMouseOut TestOnMouseOut #endif |