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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/startup/shutdown_test.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/startup/startup_test.cc
diff --git a/chrome/test/startup/startup_test.cc b/chrome/test/startup/startup_test.cc
index 853601617585b91ac39fb1fdc20a454f53941f04..653cbff01d9b51a5fbaf3fc690be68b68e33ee25 100644
--- a/chrome/test/startup/startup_test.cc
+++ b/chrome/test/startup/startup_test.cc
@@ -202,16 +202,25 @@ TEST_F(StartupTest, PerfFewTabs) {
RunPerfTestWithManyTabs("few_tabs", 5, false);
}
-TEST_F(StartupTest, PerfSeveralTabs) {
- RunPerfTestWithManyTabs("several_tabs", 20, false);
-}
-
TEST_F(StartupTest, PerfRestoreFewTabs) {
RunPerfTestWithManyTabs("restore_few_tabs", 5, true);
}
-TEST_F(StartupTest, PerfRestoreSeveralTabs) {
- RunPerfTestWithManyTabs("restore_several_tabs", 20, true);
+// http://crbug.com/46609
+#if defined(OS_MACOSX)
+#define MAYBE_PerfSeveralTabs FLAKY_PerfSeveralTabs
+#define MAYBE_PerfRestoreSeveralTabs FLAKY_PerfRestoreSeveralTabs
+#else
+#define MAYBE_PerfSeveralTabs PerfSeveralTabs
+#define MAYBE_PerfRestoreSeveralTabs PerfRestoreSeveralTabs
+#endif
+
+TEST_F(StartupTest, MAYBE_PerfSeveralTabs) {
+ RunPerfTestWithManyTabs("several_tabs", 10, false);
+}
+
+TEST_F(StartupTest, MAYBE_PerfRestoreSeveralTabs) {
+ RunPerfTestWithManyTabs("restore_several_tabs", 10, true);
}
TEST_F(StartupTest, PerfExtensionEmpty) {
« 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