diff options
author | jianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-06 18:28:54 +0000 |
---|---|---|
committer | jianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-06 18:28:54 +0000 |
commit | 20594ed930aabb103cf73e755c4108a6fdc5fc33 (patch) | |
tree | 70586a557374a040022fc758a22bdfd095f3b018 /chrome/worker/worker_uitest.cc | |
parent | e05c55d4aa4b1e8698f4d013c7ad4899fa9f933c (diff) | |
download | chromium_src-20594ed930aabb103cf73e755c4108a6fdc5fc33.zip chromium_src-20594ed930aabb103cf73e755c4108a6fdc5fc33.tar.gz chromium_src-20594ed930aabb103cf73e755c4108a6fdc5fc33.tar.bz2 |
Enable worker layout tests after the WebKit patch to fix an assert is landed.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/160676
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22627 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/worker/worker_uitest.cc')
-rw-r--r-- | chrome/worker/worker_uitest.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc index 3421dbd..cd94fd4 100644 --- a/chrome/worker/worker_uitest.cc +++ b/chrome/worker/worker_uitest.cc @@ -27,20 +27,20 @@ class WorkerTest : public UILayoutTest { } }; -TEST_F(WorkerTest, DISABLED_SingleWorker) { +TEST_F(WorkerTest, SingleWorker) { RunTest(L"single_worker.html"); } -TEST_F(WorkerTest, DISABLED_MultipleWorkers) { +TEST_F(WorkerTest, MultipleWorkers) { RunTest(L"multi_worker.html"); } -TEST_F(WorkerTest, DISABLED_WorkerFastLayoutTests) { +TEST_F(WorkerTest, WorkerFastLayoutTests) { static const char* kLayoutTestFiles[] = { "stress-js-execution.html", "use-machine-stack.html", "worker-call.html", - "worker-close.html", + //"worker-close.html", "worker-constructor.html", "worker-context-gc.html", "worker-event-listener.html", @@ -66,7 +66,7 @@ TEST_F(WorkerTest, DISABLED_WorkerFastLayoutTests) { RunLayoutTest(kLayoutTestFiles[i], false); } -TEST_F(WorkerTest, DISABLED_WorkerHttpLayoutTests) { +TEST_F(WorkerTest, WorkerHttpLayoutTests) { static const char* kLayoutTestFiles[] = { // flakey? BUG 16934 "text-encoding.html", "worker-importScripts.html", @@ -88,7 +88,7 @@ TEST_F(WorkerTest, DISABLED_WorkerHttpLayoutTests) { StopHttpServer(); } -TEST_F(WorkerTest, DISABLED_WorkerXhrHttpLayoutTests) { +TEST_F(WorkerTest, WorkerXhrHttpLayoutTests) { static const char* kLayoutTestFiles[] = { "abort-exception-assert.html", "close.html", @@ -142,7 +142,7 @@ TEST_F(WorkerTest, DISABLED_MessagePorts) { RunLayoutTest(kLayoutTestFiles[i], false); } -TEST_F(WorkerTest, DISABLED_LimitPerPage) { +TEST_F(WorkerTest, LimitPerPage) { int max_workers_per_tab = WorkerService::kMaxWorkersPerTabWhenSeparate; GURL url = GetTestUrl(L"workers", L"many_workers.html"); url = GURL(url.spec() + StringPrintf("?count=%d", max_workers_per_tab + 1)); @@ -155,7 +155,7 @@ TEST_F(WorkerTest, DISABLED_LimitPerPage) { UITest::GetBrowserProcessCount()); } -TEST_F(WorkerTest, DISABLED_LimitTotal) { +TEST_F(WorkerTest, LimitTotal) { int max_workers_per_tab = WorkerService::kMaxWorkersPerTabWhenSeparate; int total_workers = WorkerService::kMaxWorkersWhenSeparate; |