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

Unified Diff: net/quic/chromium/quic_network_transaction_unittest.cc

Issue 2948143002: Add an async method to QuicChromiumClientSession::Handle for (Closed)
Patch Set: Address comments Created 3 years, 6 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
Index: net/quic/chromium/quic_network_transaction_unittest.cc
diff --git a/net/quic/chromium/quic_network_transaction_unittest.cc b/net/quic/chromium/quic_network_transaction_unittest.cc
index 334ae5c7ceaaef58bdab279c5af82c256ee7c8d2..898a00478cfc865e74ede7cd8c9609740295d746 100644
--- a/net/quic/chromium/quic_network_transaction_unittest.cc
+++ b/net/quic/chromium/quic_network_transaction_unittest.cc
@@ -4300,6 +4300,74 @@ TEST_P(QuicNetworkTransactionTest, QuicServerPush) {
EXPECT_LT(0, pos);
}
+// Regression test for http://crbug.com/719461 in which a promised stream
+// is closed before the pushed headers arrive, but after the connection
+// is closed and before the callbacks are executed.
+TEST_P(QuicNetworkTransactionTest, CancelServerPushAfterConnectionClose) {
+ session_params_.origins_to_force_quic_on.insert(
+ HostPortPair::FromString("mail.example.org:443"));
+
+ MockQuicData mock_quic_data;
+ QuicStreamOffset header_stream_offset = 0;
+ // Initial SETTINGS frame.
+ mock_quic_data.AddWrite(
+ ConstructInitialSettingsPacket(1, &header_stream_offset));
+ // First request: GET https://mail.example.org/
+ mock_quic_data.AddWrite(ConstructClientRequestHeadersPacket(
+ 2, GetNthClientInitiatedStreamId(0), true, true,
+ GetRequestHeaders("GET", "https", "/"), &header_stream_offset));
+ QuicStreamOffset server_header_offset = 0;
+ // Server promise for: https://mail.example.org/pushed.jpg
+ mock_quic_data.AddRead(ConstructServerPushPromisePacket(
+ 1, GetNthClientInitiatedStreamId(0), GetNthServerInitiatedStreamId(0),
+ false, GetRequestHeaders("GET", "https", "/pushed.jpg"),
+ &server_header_offset, &server_maker_));
+ // Response headers for first request.
+ mock_quic_data.AddRead(ConstructServerResponseHeadersPacket(
+ 2, GetNthClientInitiatedStreamId(0), false, false,
+ GetResponseHeaders("200 OK"), &server_header_offset));
+ // Client ACKs the response headers.
+ mock_quic_data.AddWrite(ConstructClientAckPacket(3, 2, 1, 1));
+ // Response body for first request.
+ mock_quic_data.AddRead(ConstructServerDataPacket(
+ 3, GetNthClientInitiatedStreamId(0), false, true, 0, "hello!"));
+ // Write error for the third request.
+ mock_quic_data.AddWrite(SYNCHRONOUS, ERR_FAILED);
+ mock_quic_data.AddRead(ASYNC, ERR_IO_PENDING); // No more data to read
+ mock_quic_data.AddRead(ASYNC, 0); // EOF
+ mock_quic_data.AddSocketDataToFactory(&socket_factory_);
+
+ CreateSession();
+
+ // Send a request which triggers a push promise from the server.
+ SendRequestAndExpectQuicResponse("hello!");
+
+ {
+ // Start a push transaction that will be cancelled after the connection
+ // is closed, but before the callback is executed.
+ request_.url = GURL("https://mail.example.org/pushed.jpg");
+ HttpNetworkTransaction trans(DEFAULT_PRIORITY, session_.get());
xunjieli 2017/06/22 14:43:30 Minor nit: could you name this trans2, callback2?
Ryan Hamilton 2017/06/22 20:40:38 Done.
+ TestCompletionCallback callback;
+ int rv = trans.Start(&request_, callback.callback(), net_log_.bound());
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
+ base::RunLoop().RunUntilIdle();
+
+ // Cause the connection to close on a write error.
+ HttpNetworkTransaction trans2(DEFAULT_PRIORITY, session_.get());
xunjieli 2017/06/22 14:43:30 Minor nit: could you name this trans3, callback3 a
Ryan Hamilton 2017/06/22 20:40:38 Done.
+ TestCompletionCallback callback2;
+ HttpRequestInfo request2;
+ request2.method = "GET";
+ request2.url = GURL("https://mail.example.org/");
+ request2.load_flags = 0;
+ EXPECT_THAT(trans2.Start(&request2, callback2.callback(), net_log_.bound()),
+ IsError(ERR_IO_PENDING));
+
+ base::RunLoop().RunUntilIdle();
xunjieli 2017/06/22 14:43:30 |callback2| has completed at this point, right? To
Ryan Hamilton 2017/06/22 20:40:38 Sure. Good point. In the process of doing this, I
+
+ // When |trans| goes out of scope, the underlying stream will be closed
+ }
+}
+
TEST_P(QuicNetworkTransactionTest, QuicForceHolBlocking) {
session_params_.quic_force_hol_blocking = true;
session_params_.origins_to_force_quic_on.insert(
« net/quic/chromium/quic_chromium_client_session.cc ('K') | « net/quic/chromium/quic_http_stream.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698