diff options
| author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-23 01:49:33 +0000 |
|---|---|---|
| committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-23 01:49:33 +0000 |
| commit | ad990f4d7a10425ae6099d2607c3c2d736a9ecc4 (patch) | |
| tree | 8fb36567063015be05803a83b42b38216f043d76 /chrome/browser/extensions/extension_websocket_apitest.cc | |
| parent | 31c90db374866268c693039423d05f1e5b82de47 (diff) | |
| download | chromium_src-ad990f4d7a10425ae6099d2607c3c2d736a9ecc4.zip chromium_src-ad990f4d7a10425ae6099d2607c3c2d736a9ecc4.tar.gz chromium_src-ad990f4d7a10425ae6099d2607c3c2d736a9ecc4.tar.bz2 | |
Disable ExtensionApiTest.WebSocket on Mac
BUG=56596
TEST=none
Review URL: http://codereview.chromium.org/3498001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60250 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_websocket_apitest.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_websocket_apitest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_websocket_apitest.cc b/chrome/browser/extensions/extension_websocket_apitest.cc index 8b2cc6c..227a01a 100644 --- a/chrome/browser/extensions/extension_websocket_apitest.cc +++ b/chrome/browser/extensions/extension_websocket_apitest.cc @@ -8,7 +8,14 @@ #include "chrome/test/ui_test_utils.h" #include "net/base/mock_host_resolver.h" -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebSocket) { +#if defined(OS_MACOSX) +// WebSocket test started timing out - suspect webkit roll from 67965->68051. +// http://crbug.com/56596 +#define MAYBE_WebSocket DISABLED_WebSocket +#else +#define MAYBE_WebSocket WebSocket +#endif +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_WebSocket) { FilePath websocket_root_dir; PathService::Get(chrome::DIR_TEST_DATA, &websocket_root_dir); websocket_root_dir = websocket_root_dir.AppendASCII("layout_tests") |