summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-06 17:46:47 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-06 17:46:47 +0000
commit47a6feba16eb93c80a7e3fadda468c80f8819bb6 (patch)
tree59695080e30cbfdfae73fd2ca96778ff20ec9096
parent6424c3e2ae6f34fa34e07c125974ca3ca43c757c (diff)
downloadchromium_src-47a6feba16eb93c80a7e3fadda468c80f8819bb6.zip
chromium_src-47a6feba16eb93c80a7e3fadda468c80f8819bb6.tar.gz
chromium_src-47a6feba16eb93c80a7e3fadda468c80f8819bb6.tar.bz2
Disable ExtensionApiTest.Tabs, it flakily exceeds test timeout.
TBR=skerner TEST=none BUG=43440 Review URL: http://codereview.chromium.org/1988004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46586 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/extensions/extension_tabs_apitest.cc10
1 files changed, 2 insertions, 8 deletions
diff --git a/chrome/browser/extensions/extension_tabs_apitest.cc b/chrome/browser/extensions/extension_tabs_apitest.cc
index c50fbd9..ded47cb 100644
--- a/chrome/browser/extensions/extension_tabs_apitest.cc
+++ b/chrome/browser/extensions/extension_tabs_apitest.cc
@@ -9,14 +9,8 @@
#include "chrome/browser/profile.h"
#include "chrome/common/pref_names.h"
-// TODO(skerner): This test times out on chrome os: http://crbug.com/39843
-#if defined(OS_LINUX) && defined(TOOLKIT_VIEWS)
-#define MAYBE_Tabs DISABLED_Tabs
-#else
-#define MAYBE_Tabs Tabs
-#endif
-
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_Tabs) {
+// Disabled due to timeouts, see http://crbug.com/39843, http://crbug.com/43440.
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_Tabs) {
StartHTTPServer();
// The test creates a tab and checks that the URL of the new tab