summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-17 20:41:36 +0000
committerenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-17 20:41:36 +0000
commit48280439bdbf6ab359ad38c45c94924ab9a9785f (patch)
tree4377a9ab40b89216f2cb219c8e94a3be60c85e11
parentb77ee4d279ab3ef074876ea64be74d1ab415431d (diff)
downloadchromium_src-48280439bdbf6ab359ad38c45c94924ab9a9785f.zip
chromium_src-48280439bdbf6ab359ad38c45c94924ab9a9785f.tar.gz
chromium_src-48280439bdbf6ab359ad38c45c94924ab9a9785f.tar.bz2
Disable flaky OffscreenTabsApiTest.OffscreenTabMouseEvents for Win and Linux
BUG=142993 Review URL: https://chromiumcodereview.appspot.com/10836277 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152147 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/extensions/api/offscreen_tabs/offscreen_tabs_apitest.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/extensions/api/offscreen_tabs/offscreen_tabs_apitest.cc b/chrome/browser/extensions/api/offscreen_tabs/offscreen_tabs_apitest.cc
index ae61d16..b99630a 100644
--- a/chrome/browser/extensions/api/offscreen_tabs/offscreen_tabs_apitest.cc
+++ b/chrome/browser/extensions/api/offscreen_tabs/offscreen_tabs_apitest.cc
@@ -22,7 +22,13 @@ IN_PROC_BROWSER_TEST_F(OffscreenTabsApiTest, DISABLED_OffscreenTabBasics) {
}
-IN_PROC_BROWSER_TEST_F(OffscreenTabsApiTest, OffscreenTabMouseEvents) {
+#if defined (OS_WIN) || defined (OS_LINUX)
+// http://crbug.com/142993 - this times out flakily on Win/Linux
+#define MAYBE_OffscreenTabMouseEvents DISABLED_OffscreenTabMouseEvents
+#else
+#define MAYBE_OffscreenTabMouseEvents OffscreenTabMouseEvents
+#endif
+IN_PROC_BROWSER_TEST_F(OffscreenTabsApiTest, MAYBE_OffscreenTabMouseEvents) {
ASSERT_TRUE(RunExtensionSubtest("offscreen_tabs",
"mouse_events.html")) << message_;
}