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

Side by Side Diff: chrome/test/startup/startup_test.cc

Issue 2850006: Mark several tabs as flaky and ignore on mac. (Closed)
Patch Set: Change startup tests to use 10 tabs instead of 20 Created 10 years, 6 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
« no previous file with comments | « chrome/test/startup/shutdown_test.cc ('k') | 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/env_var.h" 5 #include "base/env_var.h"
6 #include "base/file_util.h" 6 #include "base/file_util.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/platform_thread.h" 8 #include "base/platform_thread.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/sys_info.h" 10 #include "base/sys_info.h"
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 } 195 }
196 RunStartupTest("warm", test_name, 196 RunStartupTest("warm", test_name,
197 false, false, 197 false, false,
198 UITest::DEFAULT_THEME); 198 UITest::DEFAULT_THEME);
199 } 199 }
200 200
201 TEST_F(StartupTest, PerfFewTabs) { 201 TEST_F(StartupTest, PerfFewTabs) {
202 RunPerfTestWithManyTabs("few_tabs", 5, false); 202 RunPerfTestWithManyTabs("few_tabs", 5, false);
203 } 203 }
204 204
205 TEST_F(StartupTest, PerfSeveralTabs) {
206 RunPerfTestWithManyTabs("several_tabs", 20, false);
207 }
208
209 TEST_F(StartupTest, PerfRestoreFewTabs) { 205 TEST_F(StartupTest, PerfRestoreFewTabs) {
210 RunPerfTestWithManyTabs("restore_few_tabs", 5, true); 206 RunPerfTestWithManyTabs("restore_few_tabs", 5, true);
211 } 207 }
212 208
213 TEST_F(StartupTest, PerfRestoreSeveralTabs) { 209 // http://crbug.com/46609
214 RunPerfTestWithManyTabs("restore_several_tabs", 20, true); 210 #if defined(OS_MACOSX)
211 #define MAYBE_PerfSeveralTabs FLAKY_PerfSeveralTabs
212 #define MAYBE_PerfRestoreSeveralTabs FLAKY_PerfRestoreSeveralTabs
213 #else
214 #define MAYBE_PerfSeveralTabs PerfSeveralTabs
215 #define MAYBE_PerfRestoreSeveralTabs PerfRestoreSeveralTabs
216 #endif
217
218 TEST_F(StartupTest, MAYBE_PerfSeveralTabs) {
219 RunPerfTestWithManyTabs("several_tabs", 10, false);
220 }
221
222 TEST_F(StartupTest, MAYBE_PerfRestoreSeveralTabs) {
223 RunPerfTestWithManyTabs("restore_several_tabs", 10, true);
215 } 224 }
216 225
217 TEST_F(StartupTest, PerfExtensionEmpty) { 226 TEST_F(StartupTest, PerfExtensionEmpty) {
218 SetUpWithFileURL(); 227 SetUpWithFileURL();
219 SetUpWithExtensionsProfile("empty"); 228 SetUpWithExtensionsProfile("empty");
220 RunStartupTest("warm", "extension_empty", 229 RunStartupTest("warm", "extension_empty",
221 false /* cold */, false /* not important */, 230 false /* cold */, false /* not important */,
222 UITest::DEFAULT_THEME); 231 UITest::DEFAULT_THEME);
223 } 232 }
224 233
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 false /* not important */, UITest::CUSTOM_FRAME); 294 false /* not important */, UITest::CUSTOM_FRAME);
286 } 295 }
287 296
288 TEST_F(StartupTest, PerfColdNativeFrameGtkTheme) { 297 TEST_F(StartupTest, PerfColdNativeFrameGtkTheme) {
289 RunStartupTest("warm", "custom-frame-gtk-theme", false /* warm */, 298 RunStartupTest("warm", "custom-frame-gtk-theme", false /* warm */,
290 false /* not important */, UITest::CUSTOM_FRAME_NATIVE_THEME); 299 false /* not important */, UITest::CUSTOM_FRAME_NATIVE_THEME);
291 } 300 }
292 #endif 301 #endif
293 302
294 } // namespace 303 } // namespace
OLDNEW
« no previous file with comments | « chrome/test/startup/shutdown_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698