summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-04 17:12:38 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-04 17:12:38 +0000
commit4136a3c698f116b260d94be196fa288d196b0d35 (patch)
tree823f5dd3ddccc3ea5b9dd4c292310b2acb48b96f
parent8165428621b0c5d43e32534202d1e700c809b8e8 (diff)
downloadchromium_src-4136a3c698f116b260d94be196fa288d196b0d35.zip
chromium_src-4136a3c698f116b260d94be196fa288d196b0d35.tar.gz
chromium_src-4136a3c698f116b260d94be196fa288d196b0d35.tar.bz2
DownloadTest: disable just the tests that are timing out.
Many of the tests are failing, but these are taking 40 seconds to fail. BUG=existing bugs that these tests are failing Review URL: http://codereview.chromium.org/3533009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61385 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/download/download_uitest.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/download/download_uitest.cc b/chrome/browser/download/download_uitest.cc
index 9c7c2e3..16db455 100644
--- a/chrome/browser/download/download_uitest.cc
+++ b/chrome/browser/download/download_uitest.cc
@@ -175,7 +175,7 @@ class DownloadTest : public UITest {
// All download tests are flaky on all platforms, http://crbug.com/35275,
// http://crbug.com/48913 and especially http://crbug.com/50060.
// Additionally, there is Windows-specific flake, http://crbug.com/20809.
-TEST_F(DownloadTest, FLAKY_DownloadMimeType) {
+TEST_F(DownloadTest, DISABLED_DownloadMimeType) {
FilePath file(FILE_PATH_LITERAL("download-test1.lib"));
EXPECT_EQ(1, GetTabCount());
@@ -224,7 +224,7 @@ TEST_F(DownloadTest, FLAKY_NoDownload) {
// All download tests are flaky on all platforms, http://crbug.com/35275,
// http://crbug.com/48913 and especially http://crbug.com/50060.
// Additionally, there is Windows-specific flake, http://crbug.com/20809.
-TEST_F(DownloadTest, FLAKY_ContentDisposition) {
+TEST_F(DownloadTest, DISABLED_ContentDisposition) {
FilePath file(FILE_PATH_LITERAL("download-test3.gif"));
FilePath download_file(FILE_PATH_LITERAL("download-test3-attachment.gif"));
@@ -246,7 +246,7 @@ TEST_F(DownloadTest, FLAKY_ContentDisposition) {
// All download tests are flaky on all platforms, http://crbug.com/35275,
// http://crbug.com/48913 and especially http://crbug.com/50060.
// Additionally, there is Windows-specific flake, http://crbug.com/20809.
-TEST_F(DownloadTest, FLAKY_PerWindowShelf) {
+TEST_F(DownloadTest, DISABLED_PerWindowShelf) {
FilePath file(FILE_PATH_LITERAL("download-test3.gif"));
FilePath download_file(FILE_PATH_LITERAL("download-test3-attachment.gif"));
@@ -314,7 +314,7 @@ TEST_F(DownloadTest, FLAKY_KnownSize) {
// All download tests are flaky on all platforms, http://crbug.com/35275,
// http://crbug.com/48913 and especially http://crbug.com/50060.
// Additionally, there is Windows-specific flake, http://crbug.com/20809.
-TEST_F(DownloadTest, FLAKY_IncognitoDownload) {
+TEST_F(DownloadTest, DISABLED_IncognitoDownload) {
// Open a regular window and sanity check default values for window / tab
// count and shelf visibility.
scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
@@ -521,7 +521,7 @@ TEST_F(DownloadTest, FLAKY_CloseNewTab3) {
// All download tests are flaky on all platforms, http://crbug.com/35275,
// http://crbug.com/48913 and especially http://crbug.com/50060.
// Additionally, there is Windows-specific flake, http://crbug.com/20809.
-TEST_F(DownloadTest, FLAKY_DontCloseNewWindow) {
+TEST_F(DownloadTest, DISABLED_DontCloseNewWindow) {
scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
ASSERT_TRUE(browser.get());
int window_count = 0;
@@ -546,7 +546,7 @@ TEST_F(DownloadTest, FLAKY_DontCloseNewWindow) {
// All download tests are flaky on all platforms, http://crbug.com/35275,
// http://crbug.com/48913 and especially http://crbug.com/50060.
// Additionally, there is Windows-specific flake, http://crbug.com/20809.
-TEST_F(DownloadTest, FLAKY_NewWindow) {
+TEST_F(DownloadTest, DISABLED_NewWindow) {
scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
ASSERT_TRUE(browser.get());
int window_count = 0;