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/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;