summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authornsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-13 15:00:35 +0000
committernsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-13 15:00:35 +0000
commit115db1d73d21e02b498a8fe369f02fdca93bb2db (patch)
tree9754c0231bc97425212c98e6c59561bb1c8fbed6 /chrome
parent3b0a31a0582c2e550587d7db5e45af97da8d6a7e (diff)
downloadchromium_src-115db1d73d21e02b498a8fe369f02fdca93bb2db.zip
chromium_src-115db1d73d21e02b498a8fe369f02fdca93bb2db.tar.gz
chromium_src-115db1d73d21e02b498a8fe369f02fdca93bb2db.tar.bz2
Disable WebSocket tests because they broke with the last webkit merge
BUG:41319 Review URL: http://codereview.chromium.org/1508034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44354 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-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 15c4e6b..7326fcb 100644
--- a/chrome/browser/extensions/extension_websocket_apitest.cc
+++ b/chrome/browser/extensions/extension_websocket_apitest.cc
@@ -13,7 +13,8 @@
#define WebSocket DISABLED_WebSocket
#endif
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebSocket) {
+// This test is disabled. See bug 41319
+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")