diff options
| author | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-02 02:00:49 +0000 |
|---|---|---|
| committer | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-02 02:00:49 +0000 |
| commit | 99bf6ddc1d1e51204ed73710eb349654205a12ad (patch) | |
| tree | bbe3ba121f9c45f27adcd7c60e4d05b9224840ac /chrome/worker | |
| parent | dad7d806d4eaded841d17ef50050b06c91a8d545 (diff) | |
| download | chromium_src-99bf6ddc1d1e51204ed73710eb349654205a12ad.zip chromium_src-99bf6ddc1d1e51204ed73710eb349654205a12ad.tar.gz chromium_src-99bf6ddc1d1e51204ed73710eb349654205a12ad.tar.bz2 | |
Mark WorkerTest.QueuedSharedWorkerStartedFromOtherTab as flaky on Mac.
BUG=48148
TEST=green tree
Review URL: http://codereview.chromium.org/2865034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51479 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/worker')
| -rw-r--r-- | chrome/worker/worker_uitest.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc index 38b2351..09e6c399 100644 --- a/chrome/worker/worker_uitest.cc +++ b/chrome/worker/worker_uitest.cc @@ -637,7 +637,15 @@ TEST_F(WorkerTest, FLAKY_MultipleTabsQueuedSharedWorker) { ASSERT_TRUE(WaitForProcessCountToBe(3, max_workers_per_tab)); } -TEST_F(WorkerTest, QueuedSharedWorkerStartedFromOtherTab) { +// Only flaky on Mac http://crbug.com/48148 +#if defined(OS_MACOSX) +#define MAYBE_QueuedSharedWorkerStartedFromOtherTab \ + FLAKY_QueuedSharedWorkerStartedFromOtherTab +#else +#define MAYBE_QueuedSharedWorkerStartedFromOtherTab \ + QueuedSharedWorkerStartedFromOtherTab +#endif +TEST_F(WorkerTest, MAYBE_QueuedSharedWorkerStartedFromOtherTab) { // Tests to make sure that queued shared workers are started up when // an instance is launched from another tab. int max_workers_per_tab = WorkerService::kMaxWorkersPerTabWhenSeparate; |