Disable some UI tests on Linux due to crashiness and/or flakiness:

- SavePageTest.SaveHTMLOnly
- SavePageTest.SaveCompleteHTML
- DownloadTest.UnknownSize
- DownloadTest.IncognitoDownload

BUG=14746,14755
TEST=no
Review URL: http://codereview.chromium.org/139006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18857 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 23 insertions, 4 deletions

diff --git a/chrome/browser/download/download_uitest.cc b/chrome/browser/download/download_uitest.cc
index 811bf00..9c6e29a 100644
--- a/chrome/browser/download/download_uitest.cc
+++ b/chrome/browser/download/download_uitest.cc
@@ -27,6 +27,14 @@
 #include "net/base/net_util.h"
 #include "net/url_request/url_request_unittest.h"
 
+#if defined(OS_LINUX)
+#define MAYBE_UnknownSize DISABLED_UnknownSize
+#define MAYBE_IncognitoDownload DISABLED_IncognitoDownload
+#else
+#define MAYBE_UnknownSize UnknownSize
+#define MAYBE_IncognitoDownload IncognitoDownload
+#endif
+
 namespace {
 
 const wchar_t kDocRoot[] = L"chrome/test/data";
@@ -270,7 +278,8 @@ TEST_F(DownloadTest, PerWindowShelf) {
 // The test will first attempt to download a file; but the server will "pause"
 // in the middle until the server receives a second request for
 // "download-finish.  At that time, the download will finish.
-TEST_F(DownloadTest, UnknownSize) {
+// Flaky on Linux: http://code.google.com/p/chromium/issues/detail?id=14746
+TEST_F(DownloadTest, MAYBE_UnknownSize) {
   GURL url(URLRequestSlowDownloadJob::kUnknownSizeUrl);
   FilePath filename;
   net::FileURLToFilePath(url, &filename);
@@ -291,7 +300,7 @@ TEST_F(DownloadTest, DISABLED_KnownSize) {
 
 // Test that when downloading an item in Incognito mode, we don't crash when
 // closing the last Incognito window (http://crbug.com/13983).
-TEST_F(DownloadTest, IncognitoDownload) {
+TEST_F(DownloadTest, MAYBE_IncognitoDownload) {
   // Open a regular window and sanity check default values for window / tab
   // count and shelf visibility.
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
diff --git a/chrome/browser/download/save_page_uitest.cc b/chrome/browser/download/save_page_uitest.cc
index 332c221..ef3f24f 100644
--- a/chrome/browser/download/save_page_uitest.cc
+++ b/chrome/browser/download/save_page_uitest.cc
@@ -15,6 +15,14 @@
 #include "chrome/test/ui/ui_test.h"
 #include "net/url_request/url_request_unittest.h"
 
+#if defined(OS_LINUX)
+#define MAYBE_SaveCompleteHTML DISABLED_SaveCompleteHTML
+#define MAYBE_SaveHTMLOnly DISABLED_SaveHTMLOnly
+#else
+#define MAYBE_SaveCompleteHTML SaveCompleteHTML
+#define MAYBE_SaveHTMLOnly SaveHTMLOnly
+#endif
+
 const char* const kTestDir = "save_page";
 
 const char* const kAppendedExtension = ".htm";
@@ -78,7 +86,8 @@ class SavePageTest : public UITest {
   FilePath download_dir_;
 };
 
-TEST_F(SavePageTest, SaveHTMLOnly) {
+// Flaky on Linux: http://code.google.com/p/chromium/issues/detail?id=14746
+TEST_F(SavePageTest, MAYBE_SaveHTMLOnly) {
   std::string file_name("a.htm");
   FilePath full_file_name = save_dir_.AppendASCII(file_name);
   FilePath dir = save_dir_.AppendASCII("a_files");
@@ -99,7 +108,8 @@ TEST_F(SavePageTest, SaveHTMLOnly) {
   EXPECT_FALSE(file_util::PathExists(dir));
 }
 
-TEST_F(SavePageTest, SaveCompleteHTML) {
+// Flaky on Linux: http://code.google.com/p/chromium/issues/detail?id=14746
+TEST_F(SavePageTest, MAYBE_SaveCompleteHTML) {
   std::string file_name = "b.htm";
   FilePath full_file_name = save_dir_.AppendASCII(file_name);
   FilePath dir = save_dir_.AppendASCII("b_files");