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

Side by Side Diff: chrome/browser/ui/browser_close_browsertest.cc

Issue 9316042: Mark some FLAKY_ tests as DISABLED_ due to timeouts. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/logging.h" 6 #include "base/logging.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/stringprintf.h" 8 #include "base/stringprintf.h"
9 #include "chrome/browser/browser_process.h" 9 #include "chrome/browser/browser_process.h"
10 #include "chrome/browser/download/download_service.h" 10 #include "chrome/browser/download/download_service.h"
(...skipping 500 matching lines...) Expand 10 before | Expand all | Expand 10 after
511 IN_PROC_BROWSER_TEST_F(BrowserCloseTest, DownloadsCloseCheck_1) { 511 IN_PROC_BROWSER_TEST_F(BrowserCloseTest, DownloadsCloseCheck_1) {
512 ASSERT_TRUE(SetupForDownloadCloseCheck()); 512 ASSERT_TRUE(SetupForDownloadCloseCheck());
513 for (size_t i = arraysize(download_close_check_cases) / 6; 513 for (size_t i = arraysize(download_close_check_cases) / 6;
514 i < 2 * arraysize(download_close_check_cases) / 6; ++i) { 514 i < 2 * arraysize(download_close_check_cases) / 6; ++i) {
515 ExecuteDownloadCloseCheckCase(i); 515 ExecuteDownloadCloseCheckCase(i);
516 } 516 }
517 } 517 }
518 518
519 // Timing out on XP debug. http://crbug.com/111914 519 // Timing out on XP debug. http://crbug.com/111914
520 #if defined(OS_WIN) 520 #if defined(OS_WIN)
521 #define MAYBE_DownloadsCloseCheck_2 FLAKY_DownloadsCloseCheck_2 521 #define MAYBE_DownloadsCloseCheck_2 DISABLED_DownloadsCloseCheck_2
522 #else 522 #else
523 #define MAYBE_DownloadsCloseCheck_2 DownloadsCloseCheck_2 523 #define MAYBE_DownloadsCloseCheck_2 DownloadsCloseCheck_2
524 #endif 524 #endif
525 525
526 IN_PROC_BROWSER_TEST_F(BrowserCloseTest, MAYBE_DownloadsCloseCheck_2) { 526 IN_PROC_BROWSER_TEST_F(BrowserCloseTest, MAYBE_DownloadsCloseCheck_2) {
527 ASSERT_TRUE(SetupForDownloadCloseCheck()); 527 ASSERT_TRUE(SetupForDownloadCloseCheck());
528 for (size_t i = 2 * arraysize(download_close_check_cases) / 6; 528 for (size_t i = 2 * arraysize(download_close_check_cases) / 6;
529 i < 3 * arraysize(download_close_check_cases) / 6; ++i) { 529 i < 3 * arraysize(download_close_check_cases) / 6; ++i) {
530 ExecuteDownloadCloseCheckCase(i); 530 ExecuteDownloadCloseCheckCase(i);
531 } 531 }
(...skipping 10 matching lines...) Expand all
542 IN_PROC_BROWSER_TEST_F(BrowserCloseTest, DownloadsCloseCheck_4) { 542 IN_PROC_BROWSER_TEST_F(BrowserCloseTest, DownloadsCloseCheck_4) {
543 ASSERT_TRUE(SetupForDownloadCloseCheck()); 543 ASSERT_TRUE(SetupForDownloadCloseCheck());
544 for (size_t i = 4 * arraysize(download_close_check_cases) / 6; 544 for (size_t i = 4 * arraysize(download_close_check_cases) / 6;
545 i < 5 * arraysize(download_close_check_cases) / 6; ++i) { 545 i < 5 * arraysize(download_close_check_cases) / 6; ++i) {
546 ExecuteDownloadCloseCheckCase(i); 546 ExecuteDownloadCloseCheckCase(i);
547 } 547 }
548 } 548 }
549 549
550 // Timing out on XP debug. http://crbug.com/111914 550 // Timing out on XP debug. http://crbug.com/111914
551 #if defined(OS_WIN) 551 #if defined(OS_WIN)
552 #define MAYBE_DownloadsCloseCheck_5 FLAKY_DownloadsCloseCheck_5 552 #define MAYBE_DownloadsCloseCheck_5 DISABLED_DownloadsCloseCheck_5
553 #else 553 #else
554 #define MAYBE_DownloadsCloseCheck_5 DownloadsCloseCheck_5 554 #define MAYBE_DownloadsCloseCheck_5 DownloadsCloseCheck_5
555 #endif 555 #endif
556 556
557 IN_PROC_BROWSER_TEST_F(BrowserCloseTest, MAYBE_DownloadsCloseCheck_5) { 557 IN_PROC_BROWSER_TEST_F(BrowserCloseTest, MAYBE_DownloadsCloseCheck_5) {
558 ASSERT_TRUE(SetupForDownloadCloseCheck()); 558 ASSERT_TRUE(SetupForDownloadCloseCheck());
559 for (size_t i = 5 * arraysize(download_close_check_cases) / 6; 559 for (size_t i = 5 * arraysize(download_close_check_cases) / 6;
560 i < 6 * arraysize(download_close_check_cases) / 6; ++i) { 560 i < 6 * arraysize(download_close_check_cases) / 6; ++i) {
561 ExecuteDownloadCloseCheckCase(i); 561 ExecuteDownloadCloseCheckCase(i);
562 } 562 }
563 } 563 }
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