diff options
| -rw-r--r-- | net/url_request/url_request_unittest.cc | 11 | ||||
| -rw-r--r-- | net/url_request/url_request_unittest.h | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc index 5d6076f..3af95e2 100644 --- a/net/url_request/url_request_unittest.cc +++ b/net/url_request/url_request_unittest.cc @@ -47,6 +47,7 @@ class URLRequestHttpCacheContext : public URLRequestContext { URLRequestHttpCacheContext() { // TODO(eroman): we turn off host caching to see if synchronous // host resolving interacts poorly with client socket pool. [experiment] + // http://crbug.com/13952 host_resolver_ = new net::HostResolver(0, 0); proxy_service_ = net::ProxyService::CreateNull(); http_transaction_factory_ = @@ -317,7 +318,8 @@ TEST_F(HTTPSRequestTest, MAYBE_HTTPSExpiredTest) { } } -TEST_F(URLRequestTest, CancelTest) { +// http://crbug.com/13952 +TEST_F(URLRequestTest, DISABLED_CancelTest) { TestDelegate d; { TestURLRequest r(GURL("http://www.google.com/"), &d); @@ -340,7 +342,8 @@ TEST_F(URLRequestTest, CancelTest) { #endif } -TEST_F(URLRequestTest, CancelTest2) { +// http://crbug.com/13952 +TEST_F(URLRequestTest, DISABLED_CancelTest2) { scoped_refptr<HTTPTestServer> server = HTTPTestServer::CreateServer(L"", NULL); ASSERT_TRUE(NULL != server.get()); @@ -369,7 +372,8 @@ TEST_F(URLRequestTest, CancelTest2) { #endif } -TEST_F(URLRequestTest, CancelTest3) { +// http://crbug.com/13952 +TEST_F(URLRequestTest, DISABLED_CancelTest3) { scoped_refptr<HTTPTestServer> server = HTTPTestServer::CreateServer(L"", NULL); ASSERT_TRUE(NULL != server.get()); @@ -397,6 +401,7 @@ TEST_F(URLRequestTest, CancelTest3) { #endif } +// http://crbug.com/13952 TEST_F(URLRequestTest, DISABLED_CancelTest4) { scoped_refptr<HTTPTestServer> server = HTTPTestServer::CreateServer(L"", NULL); diff --git a/net/url_request/url_request_unittest.h b/net/url_request/url_request_unittest.h index 3210656..fa676f8 100644 --- a/net/url_request/url_request_unittest.h +++ b/net/url_request/url_request_unittest.h @@ -45,6 +45,7 @@ class TestURLRequestContext : public URLRequestContext { TestURLRequestContext() { // TODO(eroman): we turn off host caching to see if synchronous // host resolving interacts poorly with client socket pool. [experiment] + // http://crbug.com/13952 host_resolver_ = new net::HostResolver(0, 0); proxy_service_ = net::ProxyService::CreateNull(); http_transaction_factory_ = @@ -55,6 +56,7 @@ class TestURLRequestContext : public URLRequestContext { explicit TestURLRequestContext(const std::string& proxy) { // TODO(eroman): we turn off host caching to see if synchronous // host resolving interacts poorly with client socket pool. [experiment] + // http://crbug.com/13952 host_resolver_ = new net::HostResolver(0, 0); net::ProxyConfig proxy_config; proxy_config.proxy_rules.ParseFromString(proxy); |