summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-16 10:35:51 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-16 10:35:51 +0000
commitb464ffc4c8b091c183f81bcc3720b1417e3cbae8 (patch)
treeb0044ba91c45ba27cf68e2c114dd55f94906dfe6 /chrome/browser/extensions
parent0a33b84e4b6dcb0cbeba26d2a0d7dfbebdf793c4 (diff)
downloadchromium_src-b464ffc4c8b091c183f81bcc3720b1417e3cbae8.zip
chromium_src-b464ffc4c8b091c183f81bcc3720b1417e3cbae8.tar.gz
chromium_src-b464ffc4c8b091c183f81bcc3720b1417e3cbae8.tar.bz2
Disable ExtensionApiTest.WebSocket due to a timeout.
TBR=ukai TEST=disabled BUG=38225 Review URL: http://codereview.chromium.org/1002003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41704 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/extension_websocket_apitest.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_websocket_apitest.cc b/chrome/browser/extensions/extension_websocket_apitest.cc
index 8265405..09ce92f 100644
--- a/chrome/browser/extensions/extension_websocket_apitest.cc
+++ b/chrome/browser/extensions/extension_websocket_apitest.cc
@@ -7,7 +7,8 @@
#include "chrome/test/ui_test_utils.h"
#include "net/base/mock_host_resolver.h"
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FLAKY_WebSocket) {
+// Disabled, http://crbug.com/38225
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_WebSocket) {
FilePath websocket_root_dir;
PathService::Get(chrome::DIR_TEST_DATA, &websocket_root_dir);
websocket_root_dir = websocket_root_dir.AppendASCII("layout_tests")