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

Unified Diff: net/quic/quic_network_transaction_unittest.cc

Issue 293063013: Now that the HttpStreamFactoryImpl::Job is not marking Alternate-Protocol (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix comments Created 6 years, 7 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
« no previous file with comments | « net/http/http_stream_factory_impl_job.cc ('k') | net/quic/quic_stream_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_network_transaction_unittest.cc
diff --git a/net/quic/quic_network_transaction_unittest.cc b/net/quic/quic_network_transaction_unittest.cc
index c5994a12f94155f9055142abedc1febcdf7114d7..19d85f7ec3117dc39bd5a82d5ec751f22765147f 100644
--- a/net/quic/quic_network_transaction_unittest.cc
+++ b/net/quic/quic_network_transaction_unittest.cc
@@ -798,16 +798,15 @@ TEST_P(QuicNetworkTransactionTest, BrokenAlternateProtocolReadError) {
TEST_P(QuicNetworkTransactionTest, NoBrokenAlternateProtocolIfTcpFails) {
HttpStreamFactory::EnableNpnSpdy3(); // Enables QUIC too.
- // Alternate-protocol job
+ // Alternate-protocol job will fail when the session attempts to read.
MockRead quic_reads[] = {
MockRead(ASYNC, ERR_SOCKET_NOT_CONNECTED),
};
StaticSocketDataProvider quic_data(quic_reads, arraysize(quic_reads),
NULL, 0);
- quic_data.set_connect_data(MockConnect(ASYNC, ERR_SOCKET_NOT_CONNECTED));
socket_factory_.AddSocketDataProvider(&quic_data);
- // Main job which will succeed even though the alternate job fails.
+ // Main job will also fail.
MockRead http_reads[] = {
MockRead(ASYNC, ERR_SOCKET_NOT_CONNECTED),
};
@@ -866,7 +865,7 @@ TEST_P(QuicNetworkTransactionTest, FailedZeroRttBrokenAlternateProtocol) {
EXPECT_TRUE(quic_data.at_write_eof());
}
-TEST_P(QuicNetworkTransactionTest, NoBrokenAlternateProtocolOnConnectFailure) {
+TEST_P(QuicNetworkTransactionTest, BrokenAlternateProtocolOnConnectFailure) {
HttpStreamFactory::EnableNpnSpdy3(); // Enables QUIC too.
// Alternate-protocol job will fail before creating a QUIC session.
@@ -890,7 +889,8 @@ TEST_P(QuicNetworkTransactionTest, NoBrokenAlternateProtocolOnConnectFailure) {
CreateSession();
AddQuicAlternateProtocolMapping(MockCryptoClientStream::COLD_START);
SendRequestAndExpectHttpResponse("hello from http");
- ExpectQuicAlternateProtocolMapping();
+
+ ExpectBrokenAlternateProtocolMapping();
}
TEST_P(QuicNetworkTransactionTest, ConnectionCloseDuringConnect) {
« no previous file with comments | « net/http/http_stream_factory_impl_job.cc ('k') | net/quic/quic_stream_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698