summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-28 17:37:44 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-28 17:37:44 +0000
commit26c6201704fd94e614b2a9b7b5561a5fc5486844 (patch)
tree031397e59d64a468b6b2aee04a9dc2860a0555dd
parent170acd4d2ac0b54aa387cf1f8f046d1c096b02a8 (diff)
downloadchromium_src-26c6201704fd94e614b2a9b7b5561a5fc5486844.zip
chromium_src-26c6201704fd94e614b2a9b7b5561a5fc5486844.tar.gz
chromium_src-26c6201704fd94e614b2a9b7b5561a5fc5486844.tar.bz2
The test is only failing on Mac, so lets just disabled it for Mac specifically so as to not lose test coverage on other platforms.
TBR=aa BUG=26035 TEST=None Review URL: http://codereview.chromium.org/343019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30356 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/extensions/extension_updater_unittest.cc17
1 files changed, 13 insertions, 4 deletions
diff --git a/chrome/browser/extensions/extension_updater_unittest.cc b/chrome/browser/extensions/extension_updater_unittest.cc
index e563fd6..a74bfbd 100644
--- a/chrome/browser/extensions/extension_updater_unittest.cc
+++ b/chrome/browser/extensions/extension_updater_unittest.cc
@@ -24,6 +24,15 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "libxml/globals.h"
+#if defined(OS_MACOSX)
+// These tests crash frequently on Mac 10.5 Tests debug. http://crbug.com/26035.
+#define MAYBE_TestBlacklistDownloading DISABLED_TestBlacklistDownloading
+#define MAYBE_TestBlacklistUpdateCheckRequests DISABLED_TestBlacklistUpdateCheckRequests
+#else
+#define MAYBE_TestBlacklistDownloading TestBlacklistDownloading
+#define MAYBE_TestBlacklistUpdateCheckRequests TestBlacklistUpdateCheckRequests
+#endif
+
static int expected_load_flags =
net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES;
@@ -588,8 +597,8 @@ TEST(ExtensionUpdaterTest, TestExtensionUpdateCheckRequests) {
ExtensionUpdaterTest::TestExtensionUpdateCheckRequests();
}
-// This test is disabled, see bug 26035
-TEST(ExtensionUpdaterTest, DISABLED_TestBlacklistUpdateCheckRequests) {
+// This test is disabled on Mac, see http://crbug.com/26035.
+TEST(ExtensionUpdaterTest, MAYBE_TestBlacklistUpdateCheckRequests) {
ExtensionUpdaterTest::TestBlacklistUpdateCheckRequests();
}
@@ -605,8 +614,8 @@ TEST(ExtensionUpdaterTest, TestSingleExtensionDownloading) {
ExtensionUpdaterTest::TestSingleExtensionDownloading();
}
-// This test is disabled, see bug 26035
-TEST(ExtensionUpdaterTest, DISABLED_TestBlacklistDownloading) {
+// This test is disabled on Mac, see http://crbug.com/26035.
+TEST(ExtensionUpdaterTest, MAYBE_TestBlacklistDownloading) {
ExtensionUpdaterTest::TestBlacklistDownloading();
}