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

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

Issue 3201007: Mark another test as flaky on mac to try and keep the bot greener... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 4 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) 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/environment.h" 5 #include "base/environment.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_number_conversions.h" 9 #include "base/string_number_conversions.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 } 119 }
120 120
121 TEST_F(ShutdownTest, SimpleUserQuit) { 121 TEST_F(ShutdownTest, SimpleUserQuit) {
122 RunShutdownTest("shutdown", "simple-user-quit", 122 RunShutdownTest("shutdown", "simple-user-quit",
123 true, /* important */ SIMPLE, UITest::USER_QUIT); 123 true, /* important */ SIMPLE, UITest::USER_QUIT);
124 } 124 }
125 125
126 // http://crbug.com/52858 126 // http://crbug.com/52858
127 #if defined(OS_MACOSX) 127 #if defined(OS_MACOSX)
128 #define MAYBE_SimpleSessionEnding FLAKY_SimpleSessionEnding 128 #define MAYBE_SimpleSessionEnding FLAKY_SimpleSessionEnding
129 #define MAYBE_TwentyTabsWindowClose FLAKY_TwentyTabsWindowClose
129 #define MAYBE_TwentyTabsUserQuit FLAKY_TwentyTabsUserQuit 130 #define MAYBE_TwentyTabsUserQuit FLAKY_TwentyTabsUserQuit
130 #else 131 #else
131 #define MAYBE_SimpleSessionEnding SimpleSessionEnding 132 #define MAYBE_SimpleSessionEnding SimpleSessionEnding
133 #define MAYBE_TwentyTabsWindowClose TwentyTabsWindowClose
132 #define MAYBE_TwentyTabsUserQuit TwentyTabsUserQuit 134 #define MAYBE_TwentyTabsUserQuit TwentyTabsUserQuit
133 #endif 135 #endif
134 136
135 TEST_F(ShutdownTest, MAYBE_SimpleSessionEnding) { 137 TEST_F(ShutdownTest, MAYBE_SimpleSessionEnding) {
136 RunShutdownTest("shutdown", "simple-session-ending", 138 RunShutdownTest("shutdown", "simple-session-ending",
137 true, /* important */ SIMPLE, UITest::SESSION_ENDING); 139 true, /* important */ SIMPLE, UITest::SESSION_ENDING);
138 } 140 }
139 141
140 TEST_F(ShutdownTest, TwentyTabsWindowClose) { 142 TEST_F(ShutdownTest, MAYBE_TwentyTabsWindowClose) {
141 RunShutdownTest("shutdown", "twentytabs-window-close", 143 RunShutdownTest("shutdown", "twentytabs-window-close",
142 true, /* important */ TWENTY_TABS, UITest::WINDOW_CLOSE); 144 true, /* important */ TWENTY_TABS, UITest::WINDOW_CLOSE);
143 } 145 }
144 146
145 TEST_F(ShutdownTest, MAYBE_TwentyTabsUserQuit) { 147 TEST_F(ShutdownTest, MAYBE_TwentyTabsUserQuit) {
146 RunShutdownTest("shutdown", "twentytabs-user-quit", 148 RunShutdownTest("shutdown", "twentytabs-user-quit",
147 true, /* important */ TWENTY_TABS, UITest::USER_QUIT); 149 true, /* important */ TWENTY_TABS, UITest::USER_QUIT);
148 } 150 }
149 151
150 // http://crbug.com/40671 152 // http://crbug.com/40671
151 #if defined(OS_WIN) && !defined(NDEBUG) 153 #if defined(OS_WIN) && !defined(NDEBUG)
152 #define MAYBE_TwentyTabsSessionEnding DISABLED_TwentyTabsSessionEnding 154 #define MAYBE_TwentyTabsSessionEnding DISABLED_TwentyTabsSessionEnding
153 #else 155 #else
154 #define MAYBE_TwentyTabsSessionEnding TwentyTabsSessionEnding 156 #define MAYBE_TwentyTabsSessionEnding TwentyTabsSessionEnding
155 #endif 157 #endif
156 158
157 TEST_F(ShutdownTest, MAYBE_TwentyTabsSessionEnding) { 159 TEST_F(ShutdownTest, MAYBE_TwentyTabsSessionEnding) {
158 RunShutdownTest("shutdown", "twentytabs-session-ending", 160 RunShutdownTest("shutdown", "twentytabs-session-ending",
159 true, /* important */ TWENTY_TABS, UITest::SESSION_ENDING); 161 true, /* important */ TWENTY_TABS, UITest::SESSION_ENDING);
160 } 162 }
161 163
162 } // namespace 164 } // namespace
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