diff options
| author | ukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-14 01:11:38 +0000 |
|---|---|---|
| committer | ukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-14 01:11:38 +0000 |
| commit | 93da4fb1157bec1f6fd9e802d4ddc1e4b8868768 (patch) | |
| tree | b62a7a1f5459d13d060a7a954ed078d77e9a1c81 | |
| parent | 36e7669678422402463893b50aa6d6712e37f9e8 (diff) | |
| download | chromium_src-93da4fb1157bec1f6fd9e802d4ddc1e4b8868768.zip chromium_src-93da4fb1157bec1f6fd9e802d4ddc1e4b8868768.tar.gz chromium_src-93da4fb1157bec1f6fd9e802d4ddc1e4b8868768.tar.bz2 | |
Disabled WebSocket tests on Windows,
but enabled on other platform.
new-run-webkit-websocketserver won't run on Windows
because of https://bugs.webkit.org/show_bug.cgi?id=37518
BUG=40976,40995,41319
TEST=trybots pass
Review URL: http://codereview.chromium.org/1630019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44430 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/extension_websocket_apitest.cc | 10 | ||||
| -rw-r--r-- | chrome/worker/worker_uitest.cc | 7 |
2 files changed, 11 insertions, 6 deletions
diff --git a/chrome/browser/extensions/extension_websocket_apitest.cc b/chrome/browser/extensions/extension_websocket_apitest.cc index 7326fcb..96aad30 100644 --- a/chrome/browser/extensions/extension_websocket_apitest.cc +++ b/chrome/browser/extensions/extension_websocket_apitest.cc @@ -7,14 +7,14 @@ #include "chrome/test/ui_test_utils.h" #include "net/base/mock_host_resolver.h" -// Disable this test on Linux, because it fails -// http://crbug.com/40976 -#if defined(OS_LINUX) +// Disable this test on Windows, because it fails +// http://crbug.com/40976, http://crbug.com/41319 +// https://bugs.webkit.org/show_bug.cgi?id=37518 +#if defined(OS_WIN) #define WebSocket DISABLED_WebSocket #endif -// This test is disabled. See bug 41319 -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_WebSocket) { +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebSocket) { FilePath websocket_root_dir; PathService::Get(chrome::DIR_TEST_DATA, &websocket_root_dir); websocket_root_dir = websocket_root_dir.AppendASCII("layout_tests") diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc index e59580b..557ab5b 100644 --- a/chrome/worker/worker_uitest.cc +++ b/chrome/worker/worker_uitest.cc @@ -394,7 +394,12 @@ TEST_F(WorkerTest, FLAKY_WorkerHttpLayoutTests) { } // http://crbug.com/40995 -TEST_F(WorkerTest, DISABLED_WorkerWebSocketLayoutTests) { +// https://bugs.webkit.org/show_bug.cgi?id=37518 +#if defined(OS_WIN) +#define WorkerWebSocketLayoutTests DISABLED_WorkerWebSocketLayoutTests +#endif + +TEST_F(WorkerTest, WorkerWebSocketLayoutTests) { static const char* kLayoutTestFiles[] = { "worker-simple.html", "shared-worker-simple.html", |