summaryrefslogtreecommitdiffstats
path: root/chrome/worker
diff options
context:
space:
mode:
authorukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-01 07:48:50 +0000
committerukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-01 07:48:50 +0000
commit3d7627af733f33eece75aa67cc34c10e47588205 (patch)
treef877591392b334c083742b958254fbca3dd89b79 /chrome/worker
parent73c52fb4cf7bf4540722cb98852d5c947454e7a6 (diff)
downloadchromium_src-3d7627af733f33eece75aa67cc34c10e47588205.zip
chromium_src-3d7627af733f33eece75aa67cc34c10e47588205.tar.gz
chromium_src-3d7627af733f33eece75aa67cc34c10e47588205.tar.bz2
Enable disabled WebSocket tests (ExtensionApiTest.WebSocket and WorkerWebSocketLayoutTests).
These tests were not worked well, because of some bugs in websocket server implementation for tests, in Windows XP. This was fixed in webkit r56614 and r56774. BUG=38225,33247,36630 TEST=pass ExtensionApiTest.WebSocket and WorkerWebSocketLayoutTests Review URL: http://codereview.chromium.org/1575003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43324 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/worker')
-rw-r--r--chrome/worker/worker_uitest.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc
index aaf8ac3..71a8a4a 100644
--- a/chrome/worker/worker_uitest.cc
+++ b/chrome/worker/worker_uitest.cc
@@ -402,10 +402,7 @@ TEST_F(WorkerTest, FLAKY_WorkerHttpLayoutTests) {
StopHttpServer();
}
-// This test has been marked flaky as it fails randomly on the builders.
-// http://code.google.com/p/chromium/issues/detail?id=33247
-// http://crbug.com/36630 termination issues, disabled on all platforms.
-TEST_F(WorkerTest, DISABLED_WorkerWebSocketLayoutTests) {
+TEST_F(WorkerTest, WorkerWebSocketLayoutTests) {
static const char* kLayoutTestFiles[] = {
"worker-simple.html",
"shared-worker-simple.html",