diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-09 13:18:45 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-09 13:18:45 +0000 |
| commit | e6fc0240eec4cf82e28f0fbed72b5c8d916b4c5b (patch) | |
| tree | eba89e5d8691fca752429eb18ba3349b2fc36ccf /chrome/worker | |
| parent | 81f8ef8de776f0215ce693b730df2fdf5da59cfa (diff) | |
| download | chromium_src-e6fc0240eec4cf82e28f0fbed72b5c8d916b4c5b.zip chromium_src-e6fc0240eec4cf82e28f0fbed72b5c8d916b4c5b.tar.gz chromium_src-e6fc0240eec4cf82e28f0fbed72b5c8d916b4c5b.tar.bz2 | |
Mark WorkerTest.QueuedSharedWorkerShutdown as flaky on Mac, it times out.
BUG=42641
TBR=atwilson@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58927 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/worker')
| -rw-r--r-- | chrome/worker/worker_uitest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc index f08c2cf..af6c154 100644 --- a/chrome/worker/worker_uitest.cc +++ b/chrome/worker/worker_uitest.cc @@ -581,7 +581,14 @@ TEST_F(WorkerTest, WorkerClose) { ASSERT_TRUE(WaitForProcessCountToBe(1, 0)); } -TEST_F(WorkerTest, QueuedSharedWorkerShutdown) { +// Times out on Mac OS 10.5, http://crbug.com/42641 +#if defined (OS_MACOSX) +#define MAYBE_QueuedSharedWorkerShutdown FLAKY_QueuedSharedWorkerShutdown +#else +#define MAYBE_QueuedSharedWorkerShutdown QueuedSharedWorkerShutdown +#endif + +TEST_F(WorkerTest, MAYBE_QueuedSharedWorkerShutdown) { // Tests to make sure that queued shared workers are started up when // shared workers shut down. int max_workers_per_tab = WorkerService::kMaxWorkersPerTabWhenSeparate; |