Re-enable tests that were blocked by TLS not setting initial connection flow control window. Note that this CL doesn't re-enable all tests that are blocked by TLS. Some tests still need investigation on the reason of failure. gfe-relnote: test change only, not protected. PiperOrigin-RevId: 268784273 Change-Id: I8f206aa0e32687a3e7613dd14aab7b540fbdf5ff
diff --git a/quic/core/http/quic_send_control_stream_test.cc b/quic/core/http/quic_send_control_stream_test.cc index 5c6a1a9..e989e22 100644 --- a/quic/core/http/quic_send_control_stream_test.cc +++ b/quic/core/http/quic_send_control_stream_test.cc
@@ -5,6 +5,7 @@ #include "net/third_party/quiche/src/quic/core/http/quic_send_control_stream.h" #include "net/third_party/quiche/src/quic/platform/api/quic_text_utils.h" +#include "net/third_party/quiche/src/quic/test_tools/quic_config_peer.h" #include "net/third_party/quiche/src/quic/test_tools/quic_spdy_session_peer.h" #include "net/third_party/quiche/src/quic/test_tools/quic_test_utils.h" @@ -62,6 +63,11 @@ void Initialize() { session_.Initialize(); send_control_stream_ = QuicSpdySessionPeer::GetSendControlStream(&session_); + QuicConfigPeer::SetReceivedInitialSessionFlowControlWindow( + session_.config(), kMinimumFlowControlSendWindow); + QuicConfigPeer::SetReceivedMaxIncomingUnidirectionalStreams( + session_.config(), 3); + session_.OnConfigNegotiated(); } Perspective perspective() const { return GetParam().perspective; } @@ -79,12 +85,6 @@ ::testing::ValuesIn(GetTestParams())); TEST_P(QuicSendControlStreamTest, WriteSettings) { - if (GetParam().version.handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } - session_.set_qpack_maximum_dynamic_table_capacity(255); session_.set_qpack_maximum_blocked_streams(16); session_.set_max_inbound_header_list_size(1024); @@ -128,12 +128,6 @@ } TEST_P(QuicSendControlStreamTest, WriteSettingsOnlyOnce) { - if (GetParam().version.handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } - Initialize(); testing::InSequence s; @@ -147,12 +141,6 @@ } TEST_P(QuicSendControlStreamTest, WritePriorityBeforeSettings) { - if (GetParam().version.handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } - Initialize(); testing::InSequence s;
diff --git a/quic/core/http/quic_server_session_base_test.cc b/quic/core/http/quic_server_session_base_test.cc index 1d6ca76..2570d63 100644 --- a/quic/core/http/quic_server_session_base_test.cc +++ b/quic/core/http/quic_server_session_base_test.cc
@@ -154,6 +154,9 @@ QuicSessionPeer::GetMutableCryptoStream(session_.get()) ->OnSuccessfulVersionNegotiation(supported_versions.front()); visitor_ = QuicConnectionPeer::GetVisitor(connection_); + QuicConfigPeer::SetReceivedInitialSessionFlowControlWindow( + session_->config(), kMinimumFlowControlSendWindow); + session_->OnConfigNegotiated(); } QuicStreamId GetNthClientInitiatedBidirectionalId(int n) { @@ -474,11 +477,6 @@ }; TEST_P(QuicServerSessionBaseTest, BandwidthEstimates) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } // Test that bandwidth estimate updates are sent to the client, only when // bandwidth resumption is enabled, the bandwidth estimate has changed // sufficiently, enough time has passed,
diff --git a/quic/core/http/quic_spdy_session_test.cc b/quic/core/http/quic_spdy_session_test.cc index f5bab97..9311af5 100644 --- a/quic/core/http/quic_spdy_session_test.cc +++ b/quic/core/http/quic_spdy_session_test.cc
@@ -310,6 +310,9 @@ session_.config(), session_.num_expected_unidirectional_static_streams()); } + QuicConfigPeer::SetReceivedInitialSessionFlowControlWindow( + session_.config(), kMinimumFlowControlSendWindow); + session_.OnConfigNegotiated(); connection_->AdvanceTime(QuicTime::Delta::FromSeconds(1)); TestCryptoStream* crypto_stream = session_.GetMutableCryptoStream(); EXPECT_CALL(*crypto_stream, HasPendingRetransmission()) @@ -598,11 +601,6 @@ } TEST_P(QuicSpdySessionTestServer, OnCanWrite) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } session_.set_writev_consumes_all_data(true); TestStream* stream2 = session_.CreateOutgoingBidirectionalStream(); TestStream* stream4 = session_.CreateOutgoingBidirectionalStream(); @@ -632,11 +630,6 @@ } TEST_P(QuicSpdySessionTestServer, TestBatchedWrites) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } session_.set_writev_consumes_all_data(true); TestStream* stream2 = session_.CreateOutgoingBidirectionalStream(); TestStream* stream4 = session_.CreateOutgoingBidirectionalStream(); @@ -756,11 +749,6 @@ } TEST_P(QuicSpdySessionTestServer, OnCanWriteCongestionControlBlocks) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } session_.set_writev_consumes_all_data(true); InSequence s; @@ -807,11 +795,6 @@ } TEST_P(QuicSpdySessionTestServer, OnCanWriteWriterBlocks) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } // Drive congestion control manually in order to ensure that // application-limited signaling is handled correctly. MockSendAlgorithm* send_algorithm = new StrictMock<MockSendAlgorithm>; @@ -890,11 +873,6 @@ } TEST_P(QuicSpdySessionTestServer, OnCanWriteWithClosedStream) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } session_.set_writev_consumes_all_data(true); TestStream* stream2 = session_.CreateOutgoingBidirectionalStream(); TestStream* stream4 = session_.CreateOutgoingBidirectionalStream(); @@ -1170,11 +1148,6 @@ } TEST_P(QuicSpdySessionTestServer, HandshakeUnblocksFlowControlBlockedStream) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } // Test that if a stream is flow control blocked, then on receipt of the SHLO // containing a suitable send window offset, the stream becomes unblocked. @@ -1483,8 +1456,7 @@ TEST_P(QuicSpdySessionTestServer, InvalidStreamFlowControlWindowInHandshake) { if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. + // IETF Quic doesn't require a minimum flow control window. return; } // Test that receipt of an invalid (< default) stream flow control window from @@ -1500,8 +1472,7 @@ TEST_P(QuicSpdySessionTestServer, InvalidSessionFlowControlWindowInHandshake) { if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. + // IETF Quic doesn't require a minimum flow control window. return; } // Test that receipt of an invalid (< default) session flow control window @@ -1516,13 +1487,9 @@ } TEST_P(QuicSpdySessionTestServer, TooLowUnidirectionalStreamLimitHttp3) { - if (!VersionUsesQpack(transport_version()) || - GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. + if (!VersionUsesQpack(transport_version())) { return; } - QuicConfigPeer::SetReceivedMaxIncomingUnidirectionalStreams(session_.config(), 2u); @@ -1930,11 +1897,6 @@ } TEST_P(QuicSpdySessionTestServer, OnStreamFrameLost) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } QuicConnectionPeer::SetSessionDecidesWhatToWrite(connection_); InSequence s; @@ -2009,11 +1971,6 @@ } TEST_P(QuicSpdySessionTestServer, DonotRetransmitDataOfClosedStreams) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } QuicConnectionPeer::SetSessionDecidesWhatToWrite(connection_); InSequence s;
diff --git a/quic/core/http/quic_spdy_stream_test.cc b/quic/core/http/quic_spdy_stream_test.cc index 5e4dfcb..5db0263 100644 --- a/quic/core/http/quic_spdy_stream_test.cc +++ b/quic/core/http/quic_spdy_stream_test.cc
@@ -22,6 +22,7 @@ #include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/platform/api/quic_text_utils.h" +#include "net/third_party/quiche/src/quic/test_tools/quic_config_peer.h" #include "net/third_party/quiche/src/quic/test_tools/quic_flow_controller_peer.h" #include "net/third_party/quiche/src/quic/test_tools/quic_session_peer.h" #include "net/third_party/quiche/src/quic/test_tools/quic_spdy_session_peer.h" @@ -210,6 +211,11 @@ new StrictMock<TestStream>(GetNthClientInitiatedBidirectionalId(1), session_.get(), stream_should_process_data); session_->ActivateStream(QuicWrapUnique(stream2_)); + QuicConfigPeer::SetReceivedInitialSessionFlowControlWindow( + session_->config(), kMinimumFlowControlSendWindow); + QuicConfigPeer::SetReceivedMaxIncomingUnidirectionalStreams( + session_->config(), 10); + session_->OnConfigNegotiated(); } QuicHeaderList ProcessHeaders(bool fin, const SpdyHeaderBlock& headers) { @@ -669,12 +675,6 @@ // Tests that we send a BLOCKED frame to the peer when we attempt to write, but // are flow control blocked. TEST_P(QuicSpdyStreamTest, StreamFlowControlBlocked) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } - testing::InSequence seq; Initialize(kShouldProcessData); @@ -1200,12 +1200,6 @@ // Test that writing trailers will send a FIN, as Trailers are the last thing to // be sent on a stream. TEST_P(QuicSpdyStreamTest, WritingTrailersSendsAFin) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } - Initialize(kShouldProcessData); if (VersionUsesQpack(GetParam().transport_version)) { @@ -1227,12 +1221,6 @@ } TEST_P(QuicSpdyStreamTest, ClientWritesPriority) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } - InitializeWithPerspective(kShouldProcessData, Perspective::IS_CLIENT); if (VersionUsesQpack(GetParam().transport_version)) { @@ -1273,12 +1261,6 @@ // Test that when writing trailers, the trailers that are actually sent to the // peer contain the final offset field indicating last byte of data. TEST_P(QuicSpdyStreamTest, WritingTrailersFinalOffset) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } - Initialize(kShouldProcessData); if (VersionUsesQpack(GetParam().transport_version)) { @@ -1323,12 +1305,6 @@ // Test that if trailers are written after all other data has been written // (headers and body), that this closes the stream for writing. TEST_P(QuicSpdyStreamTest, WritingTrailersClosesWriteSide) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } - Initialize(kShouldProcessData); // Expect data being written on the stream. In addition to that, headers are @@ -1421,12 +1397,6 @@ return; } - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } - const char kHeader1[] = "Header1"; const char kHeader2[] = "Header2"; const char kBody1[] = "Test1"; @@ -1478,12 +1448,6 @@ } TEST_P(QuicSpdyStreamTest, StreamBecomesZombieWithWriteThatCloses) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } - Initialize(kShouldProcessData); EXPECT_CALL(*session_, WritevData(_, _, _, _, _)).Times(AtLeast(1)); QuicStreamPeer::CloseReadSide(stream_); @@ -1503,12 +1467,6 @@ } TEST_P(QuicSpdyStreamTest, OnPriorityFrameAfterSendingData) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } - testing::InSequence seq; Initialize(kShouldProcessData); @@ -1548,12 +1506,6 @@ } TEST_P(QuicSpdyStreamTest, StreamWaitsForAcks) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } - Initialize(kShouldProcessData); QuicReferenceCountedPointer<MockAckListener> mock_ack_listener( new StrictMock<MockAckListener>); @@ -1605,12 +1557,6 @@ } TEST_P(QuicSpdyStreamTest, StreamDataGetAckedMultipleTimes) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } - Initialize(kShouldProcessData); QuicReferenceCountedPointer<MockAckListener> mock_ack_listener( new StrictMock<MockAckListener>); @@ -1666,12 +1612,6 @@ // HTTP/3 only. TEST_P(QuicSpdyStreamTest, HeadersAckNotReportedWriteOrBufferBody) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } - if (!HasFrameHeader()) { return; } @@ -1719,12 +1659,6 @@ // HTTP/3 only. TEST_P(QuicSpdyStreamTest, HeadersAckNotReportedWriteBodySlices) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } - if (!HasFrameHeader()) { return; } @@ -1760,11 +1694,6 @@ // HTTP/3 only. TEST_P(QuicSpdyStreamTest, HeaderBytesNotReportedOnRetransmission) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } if (!HasFrameHeader()) { return; } @@ -1914,12 +1843,6 @@ return; } - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } - testing::InSequence s; Initialize(kShouldProcessData); session_->qpack_decoder()->OnSetDynamicTableCapacity(1024); @@ -1977,12 +1900,6 @@ return; } - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } - testing::InSequence s; Initialize(kShouldProcessData); session_->qpack_decoder()->OnSetDynamicTableCapacity(1024); @@ -2074,12 +1991,6 @@ return; } - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } - testing::InSequence s; Initialize(kShouldProcessData); session_->qpack_decoder()->OnSetDynamicTableCapacity(1024);
diff --git a/quic/core/qpack/qpack_send_stream_test.cc b/quic/core/qpack/qpack_send_stream_test.cc index 8431afc..241c0c5 100644 --- a/quic/core/qpack/qpack_send_stream_test.cc +++ b/quic/core/qpack/qpack_send_stream_test.cc
@@ -6,6 +6,7 @@ #include "net/third_party/quiche/src/quic/core/http/http_constants.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" +#include "net/third_party/quiche/src/quic/test_tools/quic_config_peer.h" #include "net/third_party/quiche/src/quic/test_tools/quic_spdy_session_peer.h" #include "net/third_party/quiche/src/quic/test_tools/quic_test_utils.h" @@ -56,6 +57,11 @@ SupportedVersions(GetParam().version))), session_(connection_) { session_.Initialize(); + QuicConfigPeer::SetReceivedInitialSessionFlowControlWindow( + session_.config(), kMinimumFlowControlSendWindow); + QuicConfigPeer::SetReceivedMaxIncomingUnidirectionalStreams( + session_.config(), 3); + session_.OnConfigNegotiated(); qpack_send_stream_ = QuicSpdySessionPeer::GetQpackDecoderSendStream(&session_); @@ -78,11 +84,6 @@ ::testing::ValuesIn(GetTestParams())); TEST_P(QpackSendStreamTest, WriteStreamTypeOnlyFirstTime) { - if (GetParam().version.handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } std::string data = "data"; EXPECT_CALL(session_, WritevData(_, _, 1, _, _)); EXPECT_CALL(session_, WritevData(_, _, data.length(), _, _));
diff --git a/quic/core/quic_session_test.cc b/quic/core/quic_session_test.cc index 90c7e83..439dc3b 100644 --- a/quic/core/quic_session_test.cc +++ b/quic/core/quic_session_test.cc
@@ -338,6 +338,8 @@ session_.config(), kDefaultMaxStreamsPerConnection); QuicConfigPeer::SetReceivedMaxIncomingUnidirectionalStreams( session_.config(), kDefaultMaxStreamsPerConnection); + QuicConfigPeer::SetReceivedInitialSessionFlowControlWindow( + session_.config(), kMinimumFlowControlSendWindow); connection_->AdvanceTime(QuicTime::Delta::FromSeconds(1)); session_.OnConfigNegotiated(); TestCryptoStream* crypto_stream = session_.GetMutableCryptoStream(); @@ -822,11 +824,6 @@ } TEST_P(QuicSessionTestServer, OnCanWrite) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } session_.set_writev_consumes_all_data(true); TestStream* stream2 = session_.CreateOutgoingBidirectionalStream(); TestStream* stream4 = session_.CreateOutgoingBidirectionalStream(); @@ -856,11 +853,6 @@ } TEST_P(QuicSessionTestServer, TestBatchedWrites) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } session_.set_writev_consumes_all_data(true); TestStream* stream2 = session_.CreateOutgoingBidirectionalStream(); TestStream* stream4 = session_.CreateOutgoingBidirectionalStream(); @@ -1052,11 +1044,6 @@ } TEST_P(QuicSessionTestServer, OnCanWriteCongestionControlBlocks) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } session_.set_writev_consumes_all_data(true); InSequence s; @@ -1103,11 +1090,6 @@ } TEST_P(QuicSessionTestServer, OnCanWriteWriterBlocks) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } // Drive congestion control manually in order to ensure that // application-limited signaling is handled correctly. MockSendAlgorithm* send_algorithm = new StrictMock<MockSendAlgorithm>; @@ -1185,11 +1167,6 @@ } TEST_P(QuicSessionTestServer, OnCanWriteWithClosedStream) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } session_.set_writev_consumes_all_data(true); TestStream* stream2 = session_.CreateOutgoingBidirectionalStream(); TestStream* stream4 = session_.CreateOutgoingBidirectionalStream(); @@ -1445,11 +1422,6 @@ } TEST_P(QuicSessionTestServer, HandshakeUnblocksFlowControlBlockedStream) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } // Test that if a stream is flow control blocked, then on receipt of the SHLO // containing a suitable send window offset, the stream becomes unblocked. @@ -2037,11 +2009,6 @@ // Regression test of b/71548958. TEST_P(QuicSessionTestServer, TestZombieStreams) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } session_.set_writev_consumes_all_data(true); TestStream* stream2 = session_.CreateOutgoingBidirectionalStream(); @@ -2100,11 +2067,6 @@ } TEST_P(QuicSessionTestServer, OnStreamFrameLost) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } QuicConnectionPeer::SetSessionDecidesWhatToWrite(connection_); InSequence s; @@ -2182,11 +2144,6 @@ } TEST_P(QuicSessionTestServer, DonotRetransmitDataOfClosedStreams) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } QuicConnectionPeer::SetSessionDecidesWhatToWrite(connection_); InSequence s; @@ -2342,11 +2299,6 @@ // Regression test of b/115323618. TEST_P(QuicSessionTestServer, LocallyResetZombieStreams) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } QuicConnectionPeer::SetSessionDecidesWhatToWrite(connection_); session_.set_writev_consumes_all_data(true); @@ -2398,11 +2350,6 @@ } TEST_P(QuicSessionTestServer, WriteUnidirectionalStream) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } session_.set_writev_consumes_all_data(true); TestStream* stream4 = new TestStream(GetNthServerInitiatedUnidirectionalId(1), &session_, WRITE_UNIDIRECTIONAL);
diff --git a/quic/tools/quic_simple_server_stream_test.cc b/quic/tools/quic_simple_server_stream_test.cc index 55ea842..f738db6 100644 --- a/quic/tools/quic_simple_server_stream_test.cc +++ b/quic/tools/quic_simple_server_stream_test.cc
@@ -16,6 +16,7 @@ #include "net/third_party/quiche/src/quic/platform/api/quic_socket_address.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/test_tools/crypto_test_utils.h" +#include "net/third_party/quiche/src/quic/test_tools/quic_config_peer.h" #include "net/third_party/quiche/src/quic/test_tools/quic_session_peer.h" #include "net/third_party/quiche/src/quic/test_tools/quic_spdy_session_peer.h" #include "net/third_party/quiche/src/quic/test_tools/quic_stream_peer.h" @@ -211,6 +212,11 @@ &session_, BIDIRECTIONAL, &memory_cache_backend_); // Register stream_ in dynamic_stream_map_ and pass ownership to session_. session_.ActivateStream(QuicWrapUnique(stream_)); + QuicConfigPeer::SetReceivedInitialSessionFlowControlWindow( + session_.config(), kMinimumFlowControlSendWindow); + QuicConfigPeer::SetReceivedMaxIncomingUnidirectionalStreams( + session_.config(), 10); + session_.OnConfigNegotiated(); connection_->AdvanceTime(QuicTime::Delta::FromSeconds(1)); } @@ -295,11 +301,6 @@ } TEST_P(QuicSimpleServerStreamTest, TestFramingExtraData) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } InSequence seq; std::string large_body = "hello world!!!!!!"; @@ -335,11 +336,6 @@ } TEST_P(QuicSimpleServerStreamTest, SendResponseWithIllegalResponseStatus) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } // Send an illegal response with response status not supported by HTTP/2. spdy::SpdyHeaderBlock* request_headers = stream_->mutable_headers(); (*request_headers)[":path"] = "/bar"; @@ -374,11 +370,6 @@ } TEST_P(QuicSimpleServerStreamTest, SendResponseWithIllegalResponseStatus2) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } // Send an illegal response with response status not supported by HTTP/2. spdy::SpdyHeaderBlock* request_headers = stream_->mutable_headers(); (*request_headers)[":path"] = "/bar"; @@ -445,11 +436,6 @@ } TEST_P(QuicSimpleServerStreamTest, SendResponseWithValidHeaders) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } // Add a request and response with valid headers. spdy::SpdyHeaderBlock* request_headers = stream_->mutable_headers(); (*request_headers)[":path"] = "/bar"; @@ -483,11 +469,6 @@ } TEST_P(QuicSimpleServerStreamTest, SendResponseWithPushResources) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } // Tests that if a response has push resources to be send, SendResponse() will // call PromisePushResources() to handle these resources. @@ -542,11 +523,6 @@ } TEST_P(QuicSimpleServerStreamTest, PushResponseOnServerInitiatedStream) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } // Tests that PushResponse() should take the given headers as request headers // and fetch response from cache, and send it out. @@ -595,11 +571,6 @@ } TEST_P(QuicSimpleServerStreamTest, TestSendErrorResponse) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } EXPECT_CALL(session_, SendRstStream(_, QUIC_STREAM_NO_ERROR, _)).Times(0); stream_->set_fin_received(true); @@ -617,11 +588,6 @@ } TEST_P(QuicSimpleServerStreamTest, InvalidMultipleContentLength) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } EXPECT_CALL(session_, SendRstStream(_, QUIC_STREAM_NO_ERROR, _)).Times(0); spdy::SpdyHeaderBlock request_headers; @@ -639,11 +605,6 @@ } TEST_P(QuicSimpleServerStreamTest, InvalidLeadingNullContentLength) { - if (GetParam().handshake_protocol == PROTOCOL_TLS1_3) { - // TODO(nharper, b/112643533): Figure out why this test fails when TLS is - // enabled and fix it. - return; - } EXPECT_CALL(session_, SendRstStream(_, QUIC_STREAM_NO_ERROR, _)).Times(0); spdy::SpdyHeaderBlock request_headers;