summaryrefslogtreecommitdiffstats
path: root/chrome/worker
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-27 18:38:08 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-27 18:38:08 +0000
commit285db50838b50e886642a3105d6c52b9f8b30977 (patch)
tree948ec8720393a8070a272ae9529336b519867e58 /chrome/worker
parent416b81c402d6a490abfd61b87b452d54071291be (diff)
downloadchromium_src-285db50838b50e886642a3105d6c52b9f8b30977.zip
chromium_src-285db50838b50e886642a3105d6c52b9f8b30977.tar.gz
chromium_src-285db50838b50e886642a3105d6c52b9f8b30977.tar.bz2
Mark FLAKY_QueuedSharedWorkerStartedFromOtherTab flaky on all platforms.
This fails on all platforms, not just Mac. BUG=48148 Review URL: http://codereview.chromium.org/3036022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53815 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/worker')
-rw-r--r--chrome/worker/worker_uitest.cc11
1 files changed, 2 insertions, 9 deletions
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc
index 5d2004e..8453a1a 100644
--- a/chrome/worker/worker_uitest.cc
+++ b/chrome/worker/worker_uitest.cc
@@ -632,15 +632,8 @@ TEST_F(WorkerTest, FLAKY_MultipleTabsQueuedSharedWorker) {
ASSERT_TRUE(WaitForProcessCountToBe(3, max_workers_per_tab));
}
-// 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) {
+// Flaky: http://crbug.com/48148
+TEST_F(WorkerTest, FLAKY_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;