From 7606b72dae9664f9da19f8f39e3d6f9c86a4092c Mon Sep 17 00:00:00 2001 From: "rsleevi@chromium.org" Date: Thu, 14 Jul 2011 08:01:45 +0000 Subject: Disable WorkerTest.LimitPerPage on Mac BUG=48664, 88958, 87970 TEST=none TBR=jam Review URL: http://codereview.chromium.org/7366001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92496 0039d316-1c4b-4281-b951-d872f2087c98 --- content/worker/test/worker_uitest.cc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'content/worker') diff --git a/content/worker/test/worker_uitest.cc b/content/worker/test/worker_uitest.cc index 0458e62..e75af6d 100644 --- a/content/worker/test/worker_uitest.cc +++ b/content/worker/test/worker_uitest.cc @@ -557,9 +557,14 @@ TEST_F(WorkerTest, FLAKY_MessagePorts) { RunLayoutTest(kLayoutTestFiles[i], kNoHttpPort); } -// This has been flaky on Windows since r39931. http://crbug.com/36800 -// And on Mac since r51935. http://crbug.com/48664 -TEST_F(WorkerTest, FLAKY_LimitPerPage) { +#if defined(OS_MAC) +// See http://crbug.com/48664 +#define MAYBE_LimitPerPage DISABLED_LimitPerPage +#else +// See http://crbug.com/36800 for Windows/Linux +#define MAYBE_LimitPerPage FLAKY_LimitPerPage +#endif +TEST_F(WorkerTest, MAYBE_LimitPerPage) { int max_workers_per_tab = WorkerService::kMaxWorkersPerTabWhenSeparate; GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), FilePath(kManyWorkersFile)); -- cgit v1.1