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

Side by Side Diff: chrome/common/logging_chrome_uitest.cc

Issue 9406017: Flakiness cleanup: disable flaky tests under chrome/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 10 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "build/build_config.h" 5 #include "build/build_config.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #endif 9 #endif
10 10
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 #if defined(OS_WIN) 118 #if defined(OS_WIN)
119 // TODO(phajdan.jr): Make crash notifications on launch work on Win. 119 // TODO(phajdan.jr): Make crash notifications on launch work on Win.
120 wait_for_initial_loads_ = false; 120 wait_for_initial_loads_ = false;
121 #endif 121 #endif
122 launch_arguments_.AppendSwitch(switches::kRendererCheckFalseTest); 122 launch_arguments_.AppendSwitch(switches::kRendererCheckFalseTest);
123 } 123 }
124 }; 124 };
125 125
126 #if defined(OS_WIN) 126 #if defined(OS_WIN)
127 // http://crbug.com/38497 127 // http://crbug.com/38497
128 #define CheckFails FLAKY_CheckFails 128 #define CheckFails DISABLED_CheckFails
129 #elif defined(OS_MACOSX) 129 #elif defined(OS_MACOSX)
130 // Crash service doesn't exist for the Mac yet: http://crbug.com/45243 130 // Crash service doesn't exist for the Mac yet: http://crbug.com/45243
131 #define CheckFails DISABLED_CheckFails 131 #define CheckFails DISABLED_CheckFails
132 #endif 132 #endif
133 // Launch the app in assertion test mode, then close the app. 133 // Launch the app in assertion test mode, then close the app.
134 TEST_F(CheckFalseTest, CheckFails) { 134 TEST_F(CheckFalseTest, CheckFails) {
135 expected_errors_ = EXPECTED_ASSERT_ERRORS; 135 expected_errors_ = EXPECTED_ASSERT_ERRORS;
136 expected_crashes_ = EXPECTED_ASSERT_CRASHES; 136 expected_crashes_ = EXPECTED_ASSERT_CRASHES;
137 } 137 }
138 #endif // !defined(OFFICIAL_BUILD) 138 #endif // !defined(OFFICIAL_BUILD)
(...skipping 14 matching lines...) Expand all
153 // On Linux, do not expect a crash dump if Breakpad is disabled. 153 // On Linux, do not expect a crash dump if Breakpad is disabled.
154 #define EXPECTED_CRASH_CRASHES 0 154 #define EXPECTED_CRASH_CRASHES 0
155 #else 155 #else
156 #define EXPECTED_CRASH_CRASHES 1 156 #define EXPECTED_CRASH_CRASHES 1
157 #endif 157 #endif
158 158
159 #if defined(OS_MACOSX) 159 #if defined(OS_MACOSX)
160 // Crash service doesn't exist for the Mac yet: http://crbug.com/45243 160 // Crash service doesn't exist for the Mac yet: http://crbug.com/45243
161 #define MAYBE_Crash DISABLED_Crash 161 #define MAYBE_Crash DISABLED_Crash
162 #elif defined(OS_CHROME) 162 #elif defined(OS_CHROME)
163 #define MAYBE_Crash FLAKY_Crash 163 #define MAYBE_Crash DISABLED_Crash
tony 2012/02/15 19:51:50 What is OS_CHROME? I bet this does nothing :(
Peter Mayo 2012/03/02 04:59:30 As of build 6066 of an internal builder for chrome
164 #else 164 #else
165 #define MAYBE_Crash Crash 165 #define MAYBE_Crash Crash
166 #endif 166 #endif
167 // Launch the app in renderer crash test mode, then close the app. 167 // Launch the app in renderer crash test mode, then close the app.
168 TEST_F(RendererCrashTest, MAYBE_Crash) { 168 TEST_F(RendererCrashTest, MAYBE_Crash) {
169 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); 169 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
170 ASSERT_TRUE(browser.get()); 170 ASSERT_TRUE(browser.get());
171 ASSERT_TRUE(browser->WaitForTabCountToBecome(1)); 171 ASSERT_TRUE(browser->WaitForTabCountToBecome(1));
172 expected_crashes_ = EXPECTED_CRASH_CRASHES; 172 expected_crashes_ = EXPECTED_CRASH_CRASHES;
173 } 173 }
OLDNEW
« no previous file with comments | « chrome/common/important_file_writer_unittest.cc ('k') | chrome/common/service_process_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698