diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-29 22:41:31 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-29 22:41:31 +0000 |
| commit | 1a8ec06af8196c765883fde93e259bdf5e36c82b (patch) | |
| tree | c63b0632d2acbc13d9ee77e9d31935ba7d846c63 /content | |
| parent | 7ec1fb15a7e6bf7164729cf69a87da5cdf102f4b (diff) | |
| download | chromium_src-1a8ec06af8196c765883fde93e259bdf5e36c82b.zip chromium_src-1a8ec06af8196c765883fde93e259bdf5e36c82b.tar.gz chromium_src-1a8ec06af8196c765883fde93e259bdf5e36c82b.tar.bz2 | |
Disable flaky tests
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129708 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/worker_host/test/worker_browsertest.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/content/browser/worker_host/test/worker_browsertest.cc b/content/browser/worker_host/test/worker_browsertest.cc index 558977a..0611ac6e49 100644 --- a/content/browser/worker_host/test/worker_browsertest.cc +++ b/content/browser/worker_host/test/worker_browsertest.cc @@ -178,12 +178,8 @@ class WorkerHttpLayoutTest : public InProcessBrowserLayoutTest { } }; -#if defined(OS_MACOSX) -// http://crbug.com/16934 hang on Mac sometimes +// http://crbug.com/16934 IN_PROC_BROWSER_TEST_F(WorkerHttpLayoutTest, DISABLED_Tests) { -#else -IN_PROC_BROWSER_TEST_F(WorkerHttpLayoutTest, Tests) { -#endif static const char* kLayoutTestFiles[] = { "shared-worker-importScripts.html", "shared-worker-redirect.html", @@ -253,7 +249,7 @@ class WorkerWebSocketHttpLayoutTest : public InProcessBrowserLayoutTest { } }; -IN_PROC_BROWSER_TEST_F(WorkerWebSocketHttpLayoutTest, Tests) { +IN_PROC_BROWSER_TEST_F(WorkerWebSocketHttpLayoutTest, DISABLED_Tests) { static const char* kLayoutTestFiles[] = { "close-in-onmessage-crash.html", "close-in-shared-worker.html", @@ -384,7 +380,7 @@ IN_PROC_BROWSER_TEST_F(WorkerTest, LimitPerPage) { } // http://crbug.com/36800 -IN_PROC_BROWSER_TEST_F(WorkerTest, LimitTotal) { +IN_PROC_BROWSER_TEST_F(WorkerTest, DISABLED_LimitTotal) { int max_workers_per_tab = WorkerServiceImpl::kMaxWorkersPerTabWhenSeparate; int total_workers = WorkerServiceImpl::kMaxWorkersWhenSeparate; @@ -465,7 +461,7 @@ IN_PROC_BROWSER_TEST_F(WorkerTest, DISABLED_MultipleTabsQueuedSharedWorker) { } // Flaky: http://crbug.com/48148 -IN_PROC_BROWSER_TEST_F(WorkerTest, QueuedSharedWorkerStartedFromOtherTab) { +IN_PROC_BROWSER_TEST_F(WorkerTest, DISABLED_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 = WorkerServiceImpl::kMaxWorkersPerTabWhenSeparate; |