diff options
| author | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-26 03:26:13 +0000 |
|---|---|---|
| committer | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-26 03:26:13 +0000 |
| commit | beb36b7f79a9ce774f0944b30eca91d2499bbeaa (patch) | |
| tree | 66a3964eab8961193356d9edbd8518b51388ed55 /chrome | |
| parent | 01c25692bcd51d81be1b5e8b215c25be5b3b1933 (diff) | |
| download | chromium_src-beb36b7f79a9ce774f0944b30eca91d2499bbeaa.zip chromium_src-beb36b7f79a9ce774f0944b30eca91d2499bbeaa.tar.gz chromium_src-beb36b7f79a9ce774f0944b30eca91d2499bbeaa.tar.bz2 | |
The following 3 ui tests have been flaky on Linux.
DownloadTest.DownloadMimeType
DownlaodTest.ContentDisposition
SavePageTest.FilenameFromPageTitle
BUG=15416,15244
http://crbug.com/15416
http://crbug.com/15244
TEST=Linux UI test bots do not fail due to these tests
TBR=estade
Original review: http://codereview.chromium.org/147179
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19334 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/download/download_uitest.cc | 11 | ||||
| -rw-r--r-- | chrome/browser/download/save_page_uitest.cc | 5 |
2 files changed, 12 insertions, 4 deletions
diff --git a/chrome/browser/download/download_uitest.cc b/chrome/browser/download/download_uitest.cc index 568eb55..a9a5125 100644 --- a/chrome/browser/download/download_uitest.cc +++ b/chrome/browser/download/download_uitest.cc @@ -30,12 +30,17 @@ #if defined(OS_LINUX) #define MAYBE_UnknownSize DISABLED_UnknownSize #define MAYBE_IncognitoDownload DISABLED_IncognitoDownload -// It's flaky on Linux (http://crbug.com/15211) +// http://crbug.com/15211 #define MAYBE_PerWindowShelf DISABLED_PerWindowShelf +// http://crbug.com/15244 +#define MAYBE_DownloadMimeType DISABLED_DownloadMimeType +#define MAYBE_ContentDisposition DISABLED_ContentDisposition #else #define MAYBE_UnknownSize UnknownSize #define MAYBE_IncognitoDownload IncognitoDownload #define MAYBE_PerWindowShelf PerWindowShelf +#define MAYBE_DownloadMimeType DownloadMimeType +#define MAYBE_ContentDisposition ContentDisposition #endif namespace { @@ -166,7 +171,7 @@ class DownloadTest : public UITest { // Download a file with non-viewable content, verify that the // download tab opened and the file exists. -TEST_F(DownloadTest, DownloadMimeType) { +TEST_F(DownloadTest, MAYBE_DownloadMimeType) { FilePath file(FILE_PATH_LITERAL("download-test1.lib")); EXPECT_EQ(1, GetTabCount()); @@ -214,7 +219,7 @@ TEST_F(DownloadTest, NoDownload) { // Download a 0-size file with a content-disposition header, verify that the // download tab opened and the file exists as the filename specified in the // header. This also ensures we properly handle empty file downloads. -TEST_F(DownloadTest, ContentDisposition) { +TEST_F(DownloadTest, MAYBE_ContentDisposition) { FilePath file(FILE_PATH_LITERAL("download-test3.gif")); FilePath download_file(FILE_PATH_LITERAL("download-test3-attachment.gif")); diff --git a/chrome/browser/download/save_page_uitest.cc b/chrome/browser/download/save_page_uitest.cc index ef3f24f..7acec74 100644 --- a/chrome/browser/download/save_page_uitest.cc +++ b/chrome/browser/download/save_page_uitest.cc @@ -18,9 +18,12 @@ #if defined(OS_LINUX) #define MAYBE_SaveCompleteHTML DISABLED_SaveCompleteHTML #define MAYBE_SaveHTMLOnly DISABLED_SaveHTMLOnly +// http://crbug.com/15416 +#define MAYBE_FilenameFromPageTitle DISABLED_FilenameFromPageTitle #else #define MAYBE_SaveCompleteHTML SaveCompleteHTML #define MAYBE_SaveHTMLOnly SaveHTMLOnly +#define MAYBE_FilenameFromPageTitle FilenameFromPageTitle #endif const char* const kTestDir = "save_page"; @@ -150,7 +153,7 @@ TEST_F(SavePageTest, NoSave) { EXPECT_FALSE(WaitForDownloadShelfVisible(browser.get())); } -TEST_F(SavePageTest, FilenameFromPageTitle) { +TEST_F(SavePageTest, MAYBE_FilenameFromPageTitle) { std::string file_name = "b.htm"; FilePath full_file_name = download_dir_.AppendASCII( |