diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-11 11:05:03 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-11 11:05:03 +0000 |
| commit | acdbbfcc0c1ef4c7fa2ef7e3081bacc2392daa5c (patch) | |
| tree | e32d504d45541ba7f0adcec78e36d7913897e0de /net | |
| parent | ac8c7320bd5824af4cdb3c25a66044e9db96b9e6 (diff) | |
| download | chromium_src-acdbbfcc0c1ef4c7fa2ef7e3081bacc2392daa5c.zip chromium_src-acdbbfcc0c1ef4c7fa2ef7e3081bacc2392daa5c.tar.gz chromium_src-acdbbfcc0c1ef4c7fa2ef7e3081bacc2392daa5c.tar.bz2 | |
Re-enable tests marked with bug 60426, which has been closed for over a year.
BUG=60426
TEST=trybots
Review URL: https://chromiumcodereview.appspot.com/11828061
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176309 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/url_request/url_fetcher_impl_unittest.cc | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/net/url_request/url_fetcher_impl_unittest.cc b/net/url_request/url_fetcher_impl_unittest.cc index af6b2ad..2ee4d59 100644 --- a/net/url_request/url_fetcher_impl_unittest.cc +++ b/net/url_request/url_fetcher_impl_unittest.cc @@ -858,12 +858,7 @@ TEST_F(URLFetcherTest, SameThreadsTest) { MessageLoop::current()->Run(); } -#if defined(OS_MACOSX) -// SIGSEGV on Mac: http://crbug.com/60426 -TEST_F(URLFetcherTest, DISABLED_DifferentThreadsTest) { -#else TEST_F(URLFetcherTest, DifferentThreadsTest) { -#endif TestServer test_server(TestServer::TYPE_HTTP, TestServer::kLocalhost, FilePath(kDocRoot)); @@ -1108,12 +1103,7 @@ TEST_F(URLFetcherMockDnsTest, StartOnlyWhenOnline) { EXPECT_EQ(200, completed_fetcher_->GetResponseCode()); } -#if defined(OS_MACOSX) -// SIGSEGV on Mac: http://crbug.com/60426 -TEST_F(URLFetcherPostTest, DISABLED_Basic) { -#else TEST_F(URLFetcherPostTest, Basic) { -#endif TestServer test_server(TestServer::TYPE_HTTP, TestServer::kLocalhost, FilePath(kDocRoot)); @@ -1133,12 +1123,7 @@ TEST_F(URLFetcherEmptyPostTest, Basic) { MessageLoop::current()->Run(); } -#if defined(OS_MACOSX) -// SIGSEGV on Mac: http://crbug.com/60426 -TEST_F(URLFetcherUploadProgressTest, DISABLED_Basic) { -#else TEST_F(URLFetcherUploadProgressTest, Basic) { -#endif TestServer test_server(TestServer::TYPE_HTTP, TestServer::kLocalhost, FilePath(kDocRoot)); @@ -1291,12 +1276,7 @@ TEST_F(URLFetcherProtectTestPassedThrough, ServerUnavailablePropagateResponse) { MessageLoop::current()->Run(); } -#if defined(OS_MACOSX) -// SIGSEGV on Mac: http://crbug.com/60426 -TEST_F(URLFetcherBadHTTPSTest, DISABLED_BadHTTPSTest) { -#else TEST_F(URLFetcherBadHTTPSTest, BadHTTPSTest) { -#endif TestServer::SSLOptions ssl_options( TestServer::SSLOptions::CERT_EXPIRED); TestServer test_server(TestServer::TYPE_HTTPS, @@ -1308,12 +1288,7 @@ TEST_F(URLFetcherBadHTTPSTest, BadHTTPSTest) { MessageLoop::current()->Run(); } -#if defined(OS_MACOSX) -// SIGSEGV on Mac: http://crbug.com/60426 -TEST_F(URLFetcherCancelTest, DISABLED_ReleasesContext) { -#else TEST_F(URLFetcherCancelTest, ReleasesContext) { -#endif TestServer test_server(TestServer::TYPE_HTTP, TestServer::kLocalhost, FilePath(kDocRoot)); |