summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryutak@chromium.org <yutak@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-24 06:37:11 +0000
committeryutak@chromium.org <yutak@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-24 06:37:11 +0000
commit85dd5dcae7e86f4c90f6d40fee497598761b891e (patch)
treedcf9caf469ec9f85038c242af851c3ad2393d0be
parent88269e4734e1eb155eb56dec0fde7baa35cfe4b8 (diff)
downloadchromium_src-85dd5dcae7e86f4c90f6d40fee497598761b891e.zip
chromium_src-85dd5dcae7e86f4c90f6d40fee497598761b891e.tar.gz
chromium_src-85dd5dcae7e86f4c90f6d40fee497598761b891e.tar.bz2
Reenable WorkerTest.WorkerWebSocketLayoutTests.
The bug was fixed in http://trac.webkit.org/changeset/89459. This test may still fail on some bots because of a stale pywebsocket process that was not killed due to the above bug. If this happens, we need to log in to these bots and kill stale processes manually. After stale processes are killed, this test should start to pass. BUG=87066 TEST=WorkerTest.WorkerWebSocketLayoutTests Review URL: http://codereview.chromium.org/7240009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90342 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/worker/test/worker_uitest.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/content/worker/test/worker_uitest.cc b/content/worker/test/worker_uitest.cc
index 9c90632..5748ea6 100644
--- a/content/worker/test/worker_uitest.cc
+++ b/content/worker/test/worker_uitest.cc
@@ -453,9 +453,7 @@ TEST_F(WorkerTest, DISABLED_WorkerHttpLayoutTests) {
ASSERT_TRUE(http_server.Stop());
}
-// Failing since r89996 (WebKit roll 89393:89412).
-// Probably affected by WebKit r89400.
-TEST_F(WorkerTest, DISABLED_WorkerWebSocketLayoutTests) {
+TEST_F(WorkerTest, WorkerWebSocketLayoutTests) {
static const char* kLayoutTestFiles[] = {
"close-in-onmessage-crash.html",
"close-in-shared-worker.html",