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

Side by Side Diff: chrome/test/reliability/automated_ui_test_test.cc

Issue 9349028: Mark AutomatedUITestBase.IncognitoWindow as FLAKY on Mac. (Closed) Base URL: svn://chrome-svn/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
« 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) 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 "chrome/app/chrome_command_ids.h" 5 #include "chrome/app/chrome_command_ids.h"
6 #include "chrome/common/url_constants.h" 6 #include "chrome/common/url_constants.h"
7 #include "chrome/test/automation/automation_proxy.h" 7 #include "chrome/test/automation/automation_proxy.h"
8 #include "chrome/test/automation/browser_proxy.h" 8 #include "chrome/test/automation/browser_proxy.h"
9 #include "chrome/test/automation/tab_proxy.h" 9 #include "chrome/test/automation/tab_proxy.h"
10 #include "chrome/test/reliability/automated_ui_test_base.h" 10 #include "chrome/test/reliability/automated_ui_test_base.h"
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 } else { 215 } else {
216 ASSERT_EQ(3, tab_count); 216 ASSERT_EQ(3, tab_count);
217 ASSERT_TRUE(CloseActiveWindow()); 217 ASSERT_TRUE(CloseActiveWindow());
218 ASSERT_TRUE(active_browser()->GetTabCount(&tab_count)); 218 ASSERT_TRUE(active_browser()->GetTabCount(&tab_count));
219 ASSERT_EQ(2, tab_count); 219 ASSERT_EQ(2, tab_count);
220 } 220 }
221 221
222 ASSERT_FALSE(CloseActiveWindow()); 222 ASSERT_FALSE(CloseActiveWindow());
223 } 223 }
224 224
225 TEST_F(AutomatedUITestBase, IncognitoWindow) { 225 // Flaky, see http://crbug.com/113046.
226 #if defined(OS_MACOSX)
227 #define MAYBE_IncognitoWindow FLAKY_IncognitoWindow
228 #else
229 #define MAYBE_IncognitoWindow IncognitoWindow
230 #endif
231
232 TEST_F(AutomatedUITestBase, MAYBE_IncognitoWindow) {
226 int num_browser_windows; 233 int num_browser_windows;
227 int num_normal_browser_windows; 234 int num_normal_browser_windows;
228 ASSERT_TRUE(automation()->GetBrowserWindowCount(&num_browser_windows)); 235 ASSERT_TRUE(automation()->GetBrowserWindowCount(&num_browser_windows));
229 ASSERT_EQ(1, num_browser_windows); 236 ASSERT_EQ(1, num_browser_windows);
230 ASSERT_TRUE( 237 ASSERT_TRUE(
231 automation()->GetNormalBrowserWindowCount(&num_normal_browser_windows)); 238 automation()->GetNormalBrowserWindowCount(&num_normal_browser_windows));
232 ASSERT_EQ(1, num_normal_browser_windows); 239 ASSERT_EQ(1, num_normal_browser_windows);
233 240
234 ASSERT_TRUE(GoOffTheRecord()); 241 ASSERT_TRUE(GoOffTheRecord());
235 ASSERT_TRUE(GoOffTheRecord()); 242 ASSERT_TRUE(GoOffTheRecord());
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 #else 423 #else
417 #define MAYBE_ShowHistory ShowHistory 424 #define MAYBE_ShowHistory ShowHistory
418 #endif 425 #endif
419 426
420 TEST_F(AutomatedUITestBase, MAYBE_ShowHistory) { 427 TEST_F(AutomatedUITestBase, MAYBE_ShowHistory) {
421 ASSERT_TRUE(ShowHistory()); 428 ASSERT_TRUE(ShowHistory());
422 GURL url; 429 GURL url;
423 ASSERT_TRUE(GetActiveTab()->GetCurrentURL(&url)); 430 ASSERT_TRUE(GetActiveTab()->GetCurrentURL(&url));
424 ASSERT_EQ(GURL(chrome::kChromeUIHistoryURL), url); 431 ASSERT_EQ(GURL(chrome::kChromeUIHistoryURL), url);
425 } 432 }
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