Index: chrome/common/net/url_fetcher_unittest.cc |
diff --git a/chrome/common/net/url_fetcher_unittest.cc b/chrome/common/net/url_fetcher_unittest.cc |
index afcef907e93ab2e9b670a08de9bca0f73683f9e5..bd558b6cdf66365f9608a0d41f4c2da08ec84294 100644 |
--- a/chrome/common/net/url_fetcher_unittest.cc |
+++ b/chrome/common/net/url_fetcher_unittest.cc |
@@ -501,7 +501,12 @@ TEST_F(URLFetcherTest, SameThreadsTest) { |
MessageLoop::current()->Run(); |
} |
-TEST_F(URLFetcherTest, FLAKY_DifferentThreadsTest) { |
+#if defined(OS_MACOSX) |
+// SIGSEGV on Mac: http://crbug.com/60426 |
+TEST_F(URLFetcherTest, DISABLE_DifferentThreadsTest) { |
Paweł Hajdan Jr.
2011/01/24 18:41:09
DISABLE -> DISABLED. Please fix entire file.
Denis Lagno
2011/01/24 18:44:25
Done
|
+#else |
+TEST_F(URLFetcherTest, DifferentThreadsTest) { |
+#endif |
net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(kDocRoot)); |
ASSERT_TRUE(test_server.Start()); |
@@ -518,7 +523,12 @@ TEST_F(URLFetcherTest, FLAKY_DifferentThreadsTest) { |
MessageLoop::current()->Run(); |
} |
-TEST_F(URLFetcherPostTest, FLAKY_Basic) { |
+#if defined(OS_MACOSX) |
+// SIGSEGV on Mac: http://crbug.com/60426 |
+TEST_F(URLFetcherPostTest, DISABLE_Basic) { |
+#else |
+TEST_F(URLFetcherPostTest, Basic) { |
+#endif |
net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(kDocRoot)); |
ASSERT_TRUE(test_server.Start()); |
@@ -602,7 +612,12 @@ TEST_F(URLFetcherProtectTestPassedThrough, ServerUnavailablePropagateResponse) { |
net::URLRequestThrottlerManager::GetInstance()->EraseEntryForTests(url); |
} |
-TEST_F(URLFetcherBadHTTPSTest, FLAKY_BadHTTPSTest) { |
+#if defined(OS_MACOSX) |
+// SIGSEGV on Mac: http://crbug.com/60426 |
+TEST_F(URLFetcherBadHTTPSTest, DISABLE_BadHTTPSTest) { |
+#else |
+TEST_F(URLFetcherBadHTTPSTest, BadHTTPSTest) { |
+#endif |
net::TestServer::HTTPSOptions https_options( |
net::TestServer::HTTPSOptions::CERT_EXPIRED); |
net::TestServer test_server(https_options, FilePath(kDocRoot)); |
@@ -612,7 +627,12 @@ TEST_F(URLFetcherBadHTTPSTest, FLAKY_BadHTTPSTest) { |
MessageLoop::current()->Run(); |
} |
-TEST_F(URLFetcherCancelTest, FLAKY_ReleasesContext) { |
+#if defined(OS_MACOSX) |
+// SIGSEGV on Mac: http://crbug.com/60426 |
+TEST_F(URLFetcherCancelTest, DISABLE_ReleasesContext) { |
+#else |
+TEST_F(URLFetcherCancelTest, ReleasesContext) { |
+#endif |
net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(kDocRoot)); |
ASSERT_TRUE(test_server.Start()); |