Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(402)

Side by Side Diff: chrome/worker/worker_uitest.cc

Issue 545004: Mark flaky test WorkerTest.WorkerFastLayoutTests0.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/string_util.h" 5 #include "base/string_util.h"
6 #include "chrome/app/chrome_dll_resource.h" 6 #include "chrome/app/chrome_dll_resource.h"
7 #include "chrome/browser/worker_host/worker_service.h" 7 #include "chrome/browser/worker_host/worker_service.h"
8 #include "chrome/common/chrome_switches.h" 8 #include "chrome/common/chrome_switches.h"
9 #include "chrome/test/automation/browser_proxy.h" 9 #include "chrome/test/automation/browser_proxy.h"
10 #include "chrome/test/automation/tab_proxy.h" 10 #include "chrome/test/automation/tab_proxy.h"
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 RunTest(L"incognito_worker.html"); 171 RunTest(L"incognito_worker.html");
172 // Incognito worker should not share with non-incognito 172 // Incognito worker should not share with non-incognito
173 RunIncognitoTest(L"incognito_worker.html"); 173 RunIncognitoTest(L"incognito_worker.html");
174 } 174 }
175 175
176 #if defined(OS_LINUX) 176 #if defined(OS_LINUX)
177 // Crashes on Linux - http://crbug.com/22898 177 // Crashes on Linux - http://crbug.com/22898
178 #define WorkerFastLayoutTests0 DISABLED_WorkerFastLayoutTests0 178 #define WorkerFastLayoutTests0 DISABLED_WorkerFastLayoutTests0
179 #define WorkerFastLayoutTests1 DISABLED_WorkerFastLayoutTests1 179 #define WorkerFastLayoutTests1 DISABLED_WorkerFastLayoutTests1
180 #define WorkerFastLayoutTests2 DISABLED_WorkerFastLayoutTests2 180 #define WorkerFastLayoutTests2 DISABLED_WorkerFastLayoutTests2
181 #elif defined(OS_MAC)
182 // Flaky on Mac - http://crbug.com/28445
183 #define WorkerFastLayoutTests0 FLAKY_WorkerFastLayoutTests0
181 #endif 184 #endif
182 185
183 TEST_F(WorkerTest, WorkerFastLayoutTests0) { 186 TEST_F(WorkerTest, WorkerFastLayoutTests0) {
184 SCOPED_TRACE(""); 187 SCOPED_TRACE("");
185 RunWorkerFastLayoutTests(0); 188 RunWorkerFastLayoutTests(0);
186 } 189 }
187 190
188 TEST_F(WorkerTest, WorkerFastLayoutTests1) { 191 TEST_F(WorkerTest, WorkerFastLayoutTests1) {
189 SCOPED_TRACE(""); 192 SCOPED_TRACE("");
190 RunWorkerFastLayoutTests(1); 193 RunWorkerFastLayoutTests(1);
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 395
393 // Check that we didn't create more than the max number of workers. 396 // Check that we didn't create more than the max number of workers.
394 ASSERT_TRUE(WaitForProcessCountToBe(tab_count, total_workers)); 397 ASSERT_TRUE(WaitForProcessCountToBe(tab_count, total_workers));
395 398
396 // Now close a page and check that the queued workers were started. 399 // Now close a page and check that the queued workers were started.
397 tab->NavigateToURL(GetTestUrl(L"google", L"google.html")); 400 tab->NavigateToURL(GetTestUrl(L"google", L"google.html"));
398 401
399 ASSERT_TRUE(WaitForProcessCountToBe(tab_count, total_workers)); 402 ASSERT_TRUE(WaitForProcessCountToBe(tab_count, total_workers));
400 #endif 403 #endif
401 } 404 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698