summaryrefslogtreecommitdiffstats
path: root/net/url_request/url_request_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'net/url_request/url_request_unittest.cc')
-rw-r--r--net/url_request/url_request_unittest.cc17
1 files changed, 12 insertions, 5 deletions
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index 18ff111..3af95e2 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -45,7 +45,10 @@ namespace {
class URLRequestHttpCacheContext : public URLRequestContext {
public:
URLRequestHttpCacheContext() {
- host_resolver_ = new net::HostResolver;
+ // 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_ =
new net::HttpCache(
@@ -315,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);
@@ -338,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());
@@ -367,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());
@@ -395,7 +401,8 @@ TEST_F(URLRequestTest, CancelTest3) {
#endif
}
-TEST_F(URLRequestTest, CancelTest4) {
+// http://crbug.com/13952
+TEST_F(URLRequestTest, DISABLED_CancelTest4) {
scoped_refptr<HTTPTestServer> server =
HTTPTestServer::CreateServer(L"", NULL);
ASSERT_TRUE(NULL != server.get());