diff options
Diffstat (limited to 'chrome/worker')
| -rw-r--r-- | chrome/worker/worker_uitest.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc index 4bdc984..21e6a05 100644 --- a/chrome/worker/worker_uitest.cc +++ b/chrome/worker/worker_uitest.cc @@ -39,7 +39,8 @@ TEST_F(WorkerTest, DISABLED_SingleWorker) { RunTest(L"single_worker.html"); } -TEST_F(WorkerTest, MultipleWorkers) { +// This test fails after WebKit merge 49414:49432. (BUG=24652) +TEST_F(WorkerTest, DISABLED_MultipleWorkers) { RunTest(L"multi_worker.html"); } @@ -201,7 +202,8 @@ TEST_F(WorkerTest, MessagePorts) { // Disable LimitPerPage on Linux. Seems to work on Mac though: // http://code.google.com/p/chromium/issues/detail?id=22608 #if !defined(OS_LINUX) -TEST_F(WorkerTest, LimitPerPage) { +// This test fails after WebKit merge 49414:49432. (BUG=24652) +TEST_F(WorkerTest, DISABLED_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)); |