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..0b14a90193446f6b3ae172f43323834a424c224c 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(); |
} |
+#if !defined(OS_MACOSX) |
Paweł Hajdan Jr.
2011/01/24 17:00:26
nit: I think it should be #if defined FLAKY #else
Denis Lagno
2011/01/24 17:27:10
Done. Though the other way round also has its rat
|
+TEST_F(URLFetcherTest, DifferentThreadsTest) { |
+#else |
+// SIGSEGV on Mac: http://crbug.com/70608 |
TEST_F(URLFetcherTest, FLAKY_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(); |
} |
+#if !defined(OS_MACOSX) |
+TEST_F(URLFetcherPostTest, Basic) { |
+#else |
+// SIGSEGV on Mac: http://crbug.com/70608 |
TEST_F(URLFetcherPostTest, FLAKY_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); |
} |
+#if !defined(OS_MACOSX) |
+TEST_F(URLFetcherBadHTTPSTest, BadHTTPSTest) { |
+#else |
+// SIGSEGV on Mac: http://crbug.com/70608 |
TEST_F(URLFetcherBadHTTPSTest, FLAKY_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(); |
} |
+#if !defined(OS_MACOSX) |
+TEST_F(URLFetcherCancelTest, ReleasesContext) { |
+#else |
+// SIGSEGV on Mac: http://crbug.com/70608 |
TEST_F(URLFetcherCancelTest, FLAKY_ReleasesContext) { |
+#endif |
net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(kDocRoot)); |
ASSERT_TRUE(test_server.Start()); |