summaryrefslogtreecommitdiffstats
path: root/chrome/worker
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-02 22:45:34 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-02 22:45:34 +0000
commit590a993d08ac65b8828f89bc7bc12d94fb027beb (patch)
tree947b4c1891ba1002e9e8a9bbe1bb6be7354b1bfb /chrome/worker
parent962d9798fbc199913c4b1a51ae3265a14e9426fa (diff)
downloadchromium_src-590a993d08ac65b8828f89bc7bc12d94fb027beb.zip
chromium_src-590a993d08ac65b8828f89bc7bc12d94fb027beb.tar.gz
chromium_src-590a993d08ac65b8828f89bc7bc12d94fb027beb.tar.bz2
Disable WorkerTest.LimitTotal
1) Before, we were not doing fast render process termination. When we closed the tab, the render process was still lingering for a short while. 2) The last check didn't actually make sure there was one more worker; it was still counting the yet-to-terminate render process. 3) This hid the real failure, which is that there wasn't an extra worker process popping up. 4) Now that single tab termination is fast, we are actually shutting down the renderer in time to reveal this bug (sometimes---the failure is flaky). This test is disabled on linux and mac because it fails for some indeterminate reason; maybe they revealed the same problem, but have thus far been ignored. TBR=jam Review URL: http://codereview.chromium.org/242129 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27909 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/worker')
-rw-r--r--chrome/worker/worker_uitest.cc11
1 files changed, 5 insertions, 6 deletions
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc
index 77b713a..e6038392 100644
--- a/chrome/worker/worker_uitest.cc
+++ b/chrome/worker/worker_uitest.cc
@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/thread.h"
#include "chrome/browser/worker_host/worker_service.h"
#include "chrome/test/automation/browser_proxy.h"
#include "chrome/test/automation/tab_proxy.h"
@@ -206,10 +207,8 @@ TEST_F(WorkerTest, LimitPerPage) {
}
#endif
-// Disable LimitTotal on Linux and Mac.
// http://code.google.com/p/chromium/issues/detail?id=22608
-#if defined(OS_WIN)
-TEST_F(WorkerTest, LimitTotal) {
+TEST_F(WorkerTest, DISABLED_LimitTotal) {
int max_workers_per_tab = WorkerService::kMaxWorkersPerTabWhenSeparate;
int total_workers = WorkerService::kMaxWorkersWhenSeparate;
@@ -229,10 +228,10 @@ TEST_F(WorkerTest, LimitTotal) {
UITest::GetBrowserProcessCount());
// Now close the first tab and check that the queued workers were started.
- tab->Close(true);
- tab->NavigateToURL(GetTestUrl(L"google", L"google.html"));
+ ASSERT_TRUE(tab->Close(true));
+ // Give the tab process time to shut down.
+ PlatformThread::Sleep(sleep_timeout_ms());
EXPECT_EQ(total_workers + 1 + (UITest::in_process_renderer() ? 0 : tab_count),
UITest::GetBrowserProcessCount());
}
-#endif