summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorkinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-25 12:50:37 +0000
committerkinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-25 12:50:37 +0000
commita6a99988267d12f76fa032848d711939f7c8ea85 (patch)
tree40a268b17d52d82b6acc239647a6429568935b92 /content
parent5947fd89b8db8fbc017bfbcef92a7349db49b05b (diff)
downloadchromium_src-a6a99988267d12f76fa032848d711939f7c8ea85.zip
chromium_src-a6a99988267d12f76fa032848d711939f7c8ea85.tar.gz
chromium_src-a6a99988267d12f76fa032848d711939f7c8ea85.tar.bz2
Mark WorkerTest.TerminateQueuedWorkers flaky
BUG=80446 TEST=greener tree TBR=robertshield,jar,georgey Review URL: http://codereview.chromium.org/6895048 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82852 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/worker/worker_uitest.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/content/worker/worker_uitest.cc b/content/worker/worker_uitest.cc
index 7d9650f..9f75ed9 100644
--- a/content/worker/worker_uitest.cc
+++ b/content/worker/worker_uitest.cc
@@ -182,6 +182,11 @@ TEST_F(WorkerTest, MultipleSharedWorkers) {
RunTest(FilePath(FILE_PATH_LITERAL("multi_worker.html?shared=true")));
}
+#if defined(OS_LINUX) || defined(OS_CHROMEOS)
+// http://crbug.com/80446
+#define TerminateQueuedWorkers FLAKY_TerminateQueuedWorkers
+#endif
+
TEST_F(WorkerTest, TerminateQueuedWorkers) {
ASSERT_TRUE(WaitForProcessCountToBe(1, 0));
RunTest(FilePath(FILE_PATH_LITERAL("terminate_queued_workers.html")));