summaryrefslogtreecommitdiffstats
path: root/chrome/browser/download
diff options
context:
space:
mode:
authorcbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-13 21:39:11 +0000
committercbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-13 21:39:11 +0000
commit15438a027b0edc9c4eb0f9664374f276c148a7cd (patch)
treea8b8453121f0cc6b641652a1af274acaf6b23a93 /chrome/browser/download
parentab4b71ad14e3146ac4fdb87747c7d996be12e66d (diff)
downloadchromium_src-15438a027b0edc9c4eb0f9664374f276c148a7cd.zip
chromium_src-15438a027b0edc9c4eb0f9664374f276c148a7cd.tar.gz
chromium_src-15438a027b0edc9c4eb0f9664374f276c148a7cd.tar.bz2
Disable DownloadsApiTest.Downloads on OSX.
It's been timing out still, after all tests successfully run. BUG=101170 Review URL: http://codereview.chromium.org/9214001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117701 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/download')
-rw-r--r--chrome/browser/download/download_extension_apitest.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/download/download_extension_apitest.cc b/chrome/browser/download/download_extension_apitest.cc
index c847fd4..fb7f35b 100644
--- a/chrome/browser/download/download_extension_apitest.cc
+++ b/chrome/browser/download/download_extension_apitest.cc
@@ -26,7 +26,13 @@ class DownloadsApiTest : public ExtensionApiTest {
ScopedTempDir tmpdir;
};
-IN_PROC_BROWSER_TEST_F(DownloadsApiTest, Downloads) {
+// Disabled on Mac. http://crbug.com/101170
+#if defined(OS_MACOSX)
+ #define MAYBE_Downloads DISABLED_Downloads
+#else
+ #define MAYBE_Downloads Downloads
+#endif
+IN_PROC_BROWSER_TEST_F(DownloadsApiTest, MAYBE_Downloads) {
SetUpTempDownloadsDir();
ASSERT_TRUE(StartTestServer());
ASSERT_TRUE(RunExtensionTest("downloads")) << message_;