summaryrefslogtreecommitdiffstats
path: root/chrome/browser/download
diff options
context:
space:
mode:
authorjshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-24 17:08:21 +0000
committerjshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-24 17:08:21 +0000
commit15f633d4fde1ee0001ef4e1ecc0ca4d1ab8aaa43 (patch)
tree8b033bc5c8b128a770d3b797060bd8f684044b03 /chrome/browser/download
parent2c21f8a3d64ce50b4ea4f44c42cff5eb5f80aba6 (diff)
downloadchromium_src-15f633d4fde1ee0001ef4e1ecc0ca4d1ab8aaa43.zip
chromium_src-15f633d4fde1ee0001ef4e1ecc0ca4d1ab8aaa43.tar.gz
chromium_src-15f633d4fde1ee0001ef4e1ecc0ca4d1ab8aaa43.tar.bz2
Disable PerWindowShelf test on Linux because it's flaky
BUG=15211 (http://crbug.com/15211 ) TEST=PerWindowShelf test does not show up as a failure on Linux bot TBR=thakis Review URL: http://codereview.chromium.org/146091 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19135 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/download')
-rw-r--r--chrome/browser/download/download_uitest.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/download/download_uitest.cc b/chrome/browser/download/download_uitest.cc
index 9c6e29a..568eb55 100644
--- a/chrome/browser/download/download_uitest.cc
+++ b/chrome/browser/download/download_uitest.cc
@@ -30,9 +30,12 @@
#if defined(OS_LINUX)
#define MAYBE_UnknownSize DISABLED_UnknownSize
#define MAYBE_IncognitoDownload DISABLED_IncognitoDownload
+// It's flaky on Linux (http://crbug.com/15211)
+#define MAYBE_PerWindowShelf DISABLED_PerWindowShelf
#else
#define MAYBE_UnknownSize UnknownSize
#define MAYBE_IncognitoDownload IncognitoDownload
+#define MAYBE_PerWindowShelf PerWindowShelf
#endif
namespace {
@@ -234,7 +237,7 @@ TEST_F(DownloadTest, ContentDisposition) {
// Test that the download shelf is per-window by starting a download in one
// tab, opening a second tab, closing the shelf, going back to the first tab,
// and checking that the shelf is closed.
-TEST_F(DownloadTest, PerWindowShelf) {
+TEST_F(DownloadTest, MAYBE_PerWindowShelf) {
FilePath file(FILE_PATH_LITERAL("download-test3.gif"));
FilePath download_file(FILE_PATH_LITERAL("download-test3-attachment.gif"));