Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(617)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/http/http_stream_factory_impl_unittest.cc

Issue 2771263002: Retry upon 421 status code without IP pooling. (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« net/http/http_stream_factory_impl_job_controller.cc ('K') | « net/http/http_stream_factory_impl_request_unittest.cc ('k') | net/http/http_stream_factory_test_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_stream_factory_impl_unittest.cc
diff --git a/net/http/http_stream_factory_impl_unittest.cc b/net/http/http_stream_factory_impl_unittest.cc
index 4af0225298c8434feb328aa5838e2dc133bff83d..b7b07a4cff116af87cee7d0f4956542bda1c962b 100644
--- a/net/http/http_stream_factory_impl_unittest.cc
+++ b/net/http/http_stream_factory_impl_unittest.cc
@@ -692,7 +692,7 @@ TEST_F(HttpStreamFactoryTest, JobNotifiesProxy) {
std::unique_ptr<HttpStreamRequest> request(
session->http_stream_factory()->RequestStream(
request_info, DEFAULT_PRIORITY, ssl_config, ssl_config, &waiter,
- NetLogWithSource()));
+ /* enable_ip_based_pooling = */ true, NetLogWithSource()));
waiter.WaitForStream();
// The proxy that failed should now be known to the proxy_service as bad.
@@ -776,7 +776,7 @@ TEST_F(HttpStreamFactoryTest, QuicProxyMarkedAsBad) {
std::unique_ptr<HttpStreamRequest> request(
session->http_stream_factory()->RequestStream(
request_info, DEFAULT_PRIORITY, ssl_config, ssl_config, &waiter,
- NetLogWithSource()));
+ /* enable_ip_based_pooling = */ true, NetLogWithSource()));
waiter.WaitForStream();
// The proxy that failed should now be known to the proxy_service as bad.
@@ -979,7 +979,7 @@ TEST_F(HttpStreamFactoryTest, WithQUICAlternativeProxyMarkedAsBad) {
std::unique_ptr<HttpStreamRequest> request(
session->http_stream_factory()->RequestStream(
request_info, DEFAULT_PRIORITY, ssl_config, ssl_config, &waiter,
- NetLogWithSource()));
+ /* enable_ip_based_pooling = */ true, NetLogWithSource()));
waiter.WaitForStream();
// The proxy that failed should now be known to the proxy_service as
@@ -1082,7 +1082,7 @@ TEST_F(HttpStreamFactoryTest, WithQUICAlternativeProxyNotMarkedAsBad) {
std::unique_ptr<HttpStreamRequest> request(
session->http_stream_factory()->RequestStream(
request_info, DEFAULT_PRIORITY, ssl_config, ssl_config, &waiter,
- NetLogWithSource()));
+ /* enable_ip_based_pooling = */ true, NetLogWithSource()));
waiter.WaitForStream();
// The proxy that failed should now be known to the proxy_service as
@@ -1426,7 +1426,7 @@ TEST_F(HttpStreamFactoryTest, PrivacyModeDisablesChannelId) {
std::unique_ptr<HttpStreamRequest> request(
session->http_stream_factory()->RequestStream(
request_info, DEFAULT_PRIORITY, ssl_config, ssl_config, &waiter,
- NetLogWithSource()));
+ /* enable_ip_based_pooling = */ true, NetLogWithSource()));
waiter.WaitForStream();
// The stream shouldn't come from spdy as we are using different privacy mode
@@ -1502,7 +1502,7 @@ TEST_F(HttpStreamFactoryTest, PrivacyModeUsesDifferentSocketPoolGroup) {
std::unique_ptr<HttpStreamRequest> request1(
session->http_stream_factory()->RequestStream(
request_info, DEFAULT_PRIORITY, ssl_config, ssl_config, &waiter,
- NetLogWithSource()));
+ /* enable_ip_based_pooling = */ true, NetLogWithSource()));
waiter.WaitForStream();
EXPECT_EQ(GetSocketPoolGroupCount(ssl_pool), 1);
@@ -1510,7 +1510,7 @@ TEST_F(HttpStreamFactoryTest, PrivacyModeUsesDifferentSocketPoolGroup) {
std::unique_ptr<HttpStreamRequest> request2(
session->http_stream_factory()->RequestStream(
request_info, DEFAULT_PRIORITY, ssl_config, ssl_config, &waiter,
- NetLogWithSource()));
+ /* enable_ip_based_pooling = */ true, NetLogWithSource()));
waiter.WaitForStream();
EXPECT_EQ(GetSocketPoolGroupCount(ssl_pool), 1);
@@ -1519,7 +1519,7 @@ TEST_F(HttpStreamFactoryTest, PrivacyModeUsesDifferentSocketPoolGroup) {
std::unique_ptr<HttpStreamRequest> request3(
session->http_stream_factory()->RequestStream(
request_info, DEFAULT_PRIORITY, ssl_config, ssl_config, &waiter,
- NetLogWithSource()));
+ /* enable_ip_based_pooling = */ true, NetLogWithSource()));
waiter.WaitForStream();
EXPECT_EQ(GetSocketPoolGroupCount(ssl_pool), 2);
@@ -1548,7 +1548,7 @@ TEST_F(HttpStreamFactoryTest, GetLoadState) {
std::unique_ptr<HttpStreamRequest> request(
session->http_stream_factory()->RequestStream(
request_info, DEFAULT_PRIORITY, ssl_config, ssl_config, &waiter,
- NetLogWithSource()));
+ /* enable_ip_based_pooling = */ true, NetLogWithSource()));
EXPECT_EQ(LOAD_STATE_RESOLVING_HOST, request->GetLoadState());
@@ -1577,7 +1577,7 @@ TEST_F(HttpStreamFactoryTest, RequestHttpStream) {
std::unique_ptr<HttpStreamRequest> request(
session->http_stream_factory()->RequestStream(
request_info, DEFAULT_PRIORITY, ssl_config, ssl_config, &waiter,
- NetLogWithSource()));
+ /* enable_ip_based_pooling = */ true, NetLogWithSource()));
waiter.WaitForStream();
EXPECT_TRUE(waiter.stream_done());
ASSERT_TRUE(nullptr != waiter.stream());
@@ -1626,7 +1626,7 @@ TEST_F(HttpStreamFactoryTest, ReprioritizeAfterStreamReceived) {
std::unique_ptr<HttpStreamRequest> request(
session->http_stream_factory()->RequestStream(
request_info, LOWEST, ssl_config, ssl_config, &waiter,
- NetLogWithSource()));
+ /* enable_ip_based_pooling = */ true, NetLogWithSource()));
EXPECT_FALSE(waiter.stream_done());
// Confirm a stream has been created by asserting that a new session
@@ -1669,7 +1669,7 @@ TEST_F(HttpStreamFactoryTest, RequestHttpStreamOverSSL) {
std::unique_ptr<HttpStreamRequest> request(
session->http_stream_factory()->RequestStream(
request_info, DEFAULT_PRIORITY, ssl_config, ssl_config, &waiter,
- NetLogWithSource()));
+ /* enable_ip_based_pooling = */ true, NetLogWithSource()));
waiter.WaitForStream();
EXPECT_TRUE(waiter.stream_done());
ASSERT_TRUE(nullptr != waiter.stream());
@@ -1711,7 +1711,7 @@ TEST_F(HttpStreamFactoryTest, RequestHttpStreamOverProxy) {
std::unique_ptr<HttpStreamRequest> request(
session->http_stream_factory()->RequestStream(
request_info, DEFAULT_PRIORITY, ssl_config, ssl_config, &waiter,
- NetLogWithSource()));
+ /* enable_ip_based_pooling = */ true, NetLogWithSource()));
waiter.WaitForStream();
EXPECT_TRUE(waiter.stream_done());
ASSERT_TRUE(nullptr != waiter.stream());
@@ -1793,7 +1793,7 @@ TEST_F(HttpStreamFactoryTest, RequestHttpStreamOverProxyWithPreconnects) {
std::unique_ptr<HttpStreamRequest> request(
session->http_stream_factory()->RequestStream(
request_info, DEFAULT_PRIORITY, ssl_config, ssl_config, &waiter,
- NetLogWithSource()));
+ /* enable_ip_based_pooling = */ true, NetLogWithSource()));
waiter.WaitForStream();
EXPECT_TRUE(waiter.stream_done());
ASSERT_TRUE(nullptr != waiter.stream());
@@ -1842,7 +1842,8 @@ TEST_F(HttpStreamFactoryTest, RequestWebSocketBasicHandshakeStream) {
session->http_stream_factory_for_websocket()
->RequestWebSocketHandshakeStream(
request_info, DEFAULT_PRIORITY, ssl_config, ssl_config, &waiter,
- &create_helper, NetLogWithSource()));
+ &create_helper,
+ /* enable_ip_based_pooling = */ true, NetLogWithSource()));
waiter.WaitForStream();
EXPECT_TRUE(waiter.stream_done());
EXPECT_TRUE(nullptr == waiter.stream());
@@ -1885,7 +1886,8 @@ TEST_F(HttpStreamFactoryTest, RequestWebSocketBasicHandshakeStreamOverSSL) {
session->http_stream_factory_for_websocket()
->RequestWebSocketHandshakeStream(
request_info, DEFAULT_PRIORITY, ssl_config, ssl_config, &waiter,
- &create_helper, NetLogWithSource()));
+ &create_helper,
+ /* enable_ip_based_pooling = */ true, NetLogWithSource()));
waiter.WaitForStream();
EXPECT_TRUE(waiter.stream_done());
EXPECT_TRUE(nullptr == waiter.stream());
@@ -1926,7 +1928,8 @@ TEST_F(HttpStreamFactoryTest, RequestWebSocketBasicHandshakeStreamOverProxy) {
session->http_stream_factory_for_websocket()
->RequestWebSocketHandshakeStream(
request_info, DEFAULT_PRIORITY, ssl_config, ssl_config, &waiter,
- &create_helper, NetLogWithSource()));
+ &create_helper,
+ /* enable_ip_based_pooling = */ true, NetLogWithSource()));
waiter.WaitForStream();
EXPECT_TRUE(waiter.stream_done());
EXPECT_TRUE(nullptr == waiter.stream());
@@ -1980,7 +1983,7 @@ TEST_F(HttpStreamFactoryTest, RequestSpdyHttpStreamHttpsURL) {
std::unique_ptr<HttpStreamRequest> request(
session->http_stream_factory()->RequestStream(
request_info, DEFAULT_PRIORITY, ssl_config, ssl_config, &waiter,
- NetLogWithSource()));
+ /* enable_ip_based_pooling = */ true, NetLogWithSource()));
waiter.WaitForStream();
EXPECT_TRUE(waiter.stream_done());
EXPECT_TRUE(nullptr == waiter.websocket_stream());
@@ -2034,7 +2037,7 @@ TEST_F(HttpStreamFactoryTest, RequestSpdyHttpStreamHttpURL) {
std::unique_ptr<HttpStreamRequest> request(
session->http_stream_factory()->RequestStream(
request_info, DEFAULT_PRIORITY, ssl_config, ssl_config, &waiter,
- NetLogWithSource()));
+ /* enable_ip_based_pooling = */ true, NetLogWithSource()));
waiter.WaitForStream();
EXPECT_TRUE(waiter.stream_done());
EXPECT_TRUE(nullptr == waiter.websocket_stream());
@@ -2080,7 +2083,7 @@ TEST_F(HttpStreamFactoryTest, RequestBidirectionalStreamImpl) {
std::unique_ptr<HttpStreamRequest> request(
session->http_stream_factory()->RequestBidirectionalStreamImpl(
request_info, DEFAULT_PRIORITY, ssl_config, ssl_config, &waiter,
- NetLogWithSource()));
+ /* enable_ip_based_pooling = */ true, NetLogWithSource()));
waiter.WaitForStream();
EXPECT_TRUE(waiter.stream_done());
EXPECT_FALSE(waiter.websocket_stream());
@@ -2253,7 +2256,7 @@ TEST_P(HttpStreamFactoryBidirectionalQuicTest,
std::unique_ptr<HttpStreamRequest> request(
session()->http_stream_factory()->RequestBidirectionalStreamImpl(
request_info, DEFAULT_PRIORITY, ssl_config, ssl_config, &waiter,
- NetLogWithSource()));
+ /* enable_ip_based_pooling = */ true, NetLogWithSource()));
waiter.WaitForStream();
EXPECT_TRUE(waiter.stream_done());
@@ -2318,7 +2321,7 @@ TEST_P(HttpStreamFactoryBidirectionalQuicTest,
std::unique_ptr<HttpStreamRequest> request(
session()->http_stream_factory()->RequestBidirectionalStreamImpl(
request_info, DEFAULT_PRIORITY, ssl_config, ssl_config, &waiter,
- NetLogWithSource()));
+ /* enable_ip_based_pooling = */ true, NetLogWithSource()));
waiter.WaitForStream();
EXPECT_TRUE(waiter.stream_done());
@@ -2380,7 +2383,7 @@ TEST_P(HttpStreamFactoryBidirectionalQuicTest,
std::unique_ptr<HttpStreamRequest> request(
session()->http_stream_factory()->RequestBidirectionalStreamImpl(
request_info, DEFAULT_PRIORITY, ssl_config, ssl_config, &waiter,
- NetLogWithSource()));
+ /* enable_ip_based_pooling = */ true, NetLogWithSource()));
waiter.WaitForStream();
EXPECT_TRUE(waiter.stream_done());
@@ -2447,7 +2450,7 @@ TEST_F(HttpStreamFactoryTest, RequestBidirectionalStreamImplFailure) {
std::unique_ptr<HttpStreamRequest> request(
session->http_stream_factory()->RequestBidirectionalStreamImpl(
request_info, DEFAULT_PRIORITY, ssl_config, ssl_config, &waiter,
- NetLogWithSource()));
+ /* enable_ip_based_pooling = */ true, NetLogWithSource()));
waiter.WaitForStream();
EXPECT_TRUE(waiter.stream_done());
ASSERT_THAT(waiter.error_status(), IsError(ERR_FAILED));
@@ -2495,7 +2498,8 @@ TEST_F(HttpStreamFactoryTest, RequestWebSocketSpdyHandshakeStreamButGetSSL) {
session->http_stream_factory_for_websocket()
->RequestWebSocketHandshakeStream(
request_info, DEFAULT_PRIORITY, ssl_config, ssl_config, &waiter1,
- &create_helper, NetLogWithSource()));
+ &create_helper,
+ /* enable_ip_based_pooling = */ true, NetLogWithSource()));
waiter1.WaitForStream();
EXPECT_TRUE(waiter1.stream_done());
ASSERT_TRUE(nullptr != waiter1.websocket_stream());
@@ -2542,7 +2546,8 @@ TEST_F(HttpStreamFactoryTest, DISABLED_RequestWebSocketSpdyHandshakeStream) {
session->http_stream_factory_for_websocket()
->RequestWebSocketHandshakeStream(
request_info, DEFAULT_PRIORITY, ssl_config, ssl_config, &waiter1,
- &create_helper, NetLogWithSource()));
+ &create_helper,
+ /* enable_ip_based_pooling = */ true, NetLogWithSource()));
waiter1.WaitForStream();
EXPECT_TRUE(waiter1.stream_done());
ASSERT_TRUE(nullptr != waiter1.websocket_stream());
@@ -2555,7 +2560,8 @@ TEST_F(HttpStreamFactoryTest, DISABLED_RequestWebSocketSpdyHandshakeStream) {
session->http_stream_factory_for_websocket()
->RequestWebSocketHandshakeStream(
request_info, DEFAULT_PRIORITY, ssl_config, ssl_config, &waiter2,
- &create_helper, NetLogWithSource()));
+ &create_helper,
+ /* enable_ip_based_pooling = */ true, NetLogWithSource()));
waiter2.WaitForStream();
EXPECT_TRUE(waiter2.stream_done());
ASSERT_TRUE(nullptr != waiter2.websocket_stream());
@@ -2621,7 +2627,8 @@ TEST_F(HttpStreamFactoryTest, DISABLED_OrphanedWebSocketStream) {
session->http_stream_factory_for_websocket()
->RequestWebSocketHandshakeStream(
request_info, DEFAULT_PRIORITY, ssl_config, ssl_config, &waiter,
- &create_helper, NetLogWithSource()));
+ &create_helper,
+ /* enable_ip_based_pooling = */ true, NetLogWithSource()));
waiter.WaitForStream();
EXPECT_TRUE(waiter.stream_done());
EXPECT_TRUE(nullptr == waiter.stream());
« net/http/http_stream_factory_impl_job_controller.cc ('K') | « net/http/http_stream_factory_impl_request_unittest.cc ('k') | net/http/http_stream_factory_test_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698