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

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

Issue 1072003: Windows: Mark CheckFalseTest.CheckFails as flaky. It's failing on the Vista d... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 9 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) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-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 "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 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 // Initial loads will never complete due to assertion. 120 // Initial loads will never complete due to assertion.
121 wait_for_initial_loads_ = false; 121 wait_for_initial_loads_ = false;
122 122
123 // We're testing the renderer rather than the browser assertion here, 123 // We're testing the renderer rather than the browser assertion here,
124 // because the browser assertion would flunk the test during SetUp() 124 // because the browser assertion would flunk the test during SetUp()
125 // (since TAU wouldn't be able to find the browser window). 125 // (since TAU wouldn't be able to find the browser window).
126 launch_arguments_.AppendSwitch(switches::kRendererCheckFalseTest); 126 launch_arguments_.AppendSwitch(switches::kRendererCheckFalseTest);
127 } 127 }
128 }; 128 };
129 129
130 #if defined(OS_WIN)
131 // http://crbug.com/38497
132 #define CheckFails FLAKY_CheckFails
133 #endif
130 // Launch the app in assertion test mode, then close the app. 134 // Launch the app in assertion test mode, then close the app.
131 TEST_F(CheckFalseTest, CheckFails) { 135 TEST_F(CheckFalseTest, CheckFails) {
132 if (UITest::in_process_renderer()) { 136 if (UITest::in_process_renderer()) {
133 // in process mode doesn't do the crashing. 137 // in process mode doesn't do the crashing.
134 expected_errors_ = 0; 138 expected_errors_ = 0;
135 expected_crashes_ = 0; 139 expected_crashes_ = 0;
136 } else { 140 } else {
137 expected_errors_ = 1; 141 expected_errors_ = 1;
138 expected_crashes_ = EXPECTED_ASSERT_CRASHES; 142 expected_crashes_ = EXPECTED_ASSERT_CRASHES;
139 } 143 }
(...skipping 27 matching lines...) Expand all
167 if (UITest::in_process_renderer()) { 171 if (UITest::in_process_renderer()) {
168 // in process mode doesn't do the crashing. 172 // in process mode doesn't do the crashing.
169 expected_crashes_ = 0; 173 expected_crashes_ = 0;
170 } else { 174 } else {
171 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); 175 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
172 ASSERT_TRUE(browser.get()); 176 ASSERT_TRUE(browser.get());
173 ASSERT_TRUE(browser->WaitForTabCountToBecome(1, action_max_timeout_ms())); 177 ASSERT_TRUE(browser->WaitForTabCountToBecome(1, action_max_timeout_ms()));
174 expected_crashes_ = EXPECTED_CRASH_CRASHES; 178 expected_crashes_ = EXPECTED_CRASH_CRASHES;
175 } 179 }
176 } 180 }
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