commit 1faf10c21513c7441a3f6dc0553d5990bc384737
author bnc <bnc@google.com> Mon Mar 23 10:31:29 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Mar 23 10:32:12 2020 -0700
tree 16364ee6e69e4353b70015f00f7dae32e0159a8e
parent 84639a15fe700eedd3b158837c7e7e42338833f2

Remove unnecessary QuicSpdySession::SetMaxAllowedPushId() calls in tests that are not run with IETF QUIC versions.

I have locally verified that VersionUsesHttp3() is false for all of these calls,
in which case SetMaxAllowedPushId() is a no-op.

gfe-relnote: n/a, test-only change.
PiperOrigin-RevId: 302464693
Change-Id: I6fb3c14922cd3d424d6b3200097bc640fbff624b

quic/core/http/end_to_end_test.cc

diff --git a/quic/core/http/end_to_end_test.cc b/quic/core/http/end_to_end_test.cc
index c9b8f51..2bc4917 100644
--- a/quic/core/http/end_to_end_test.cc
+++ b/quic/core/http/end_to_end_test.cc
@@ -245,7 +245,6 @@
         negotiated_version_(UnsupportedQuicVersion()),
         chlo_multiplier_(0),
         stream_factory_(nullptr),
-        support_server_push_(false),
         expected_server_connection_id_length_(kQuicDefaultConnectionIdLength) {
     client_supported_versions_ = GetParam().client_supported_versions;
     server_supported_versions_ = GetParam().server_supported_versions;
@@ -292,9 +291,6 @@
     }
     client->UseConnectionIdLength(override_server_connection_id_length_);
     client->UseClientConnectionIdLength(override_client_connection_id_length_);
-    if (support_server_push_) {
-      client->client()->SetMaxAllowedPushId(kMaxQuicStreamId);
-    }
     client->client()->set_connection_debug_visitor(connection_debug_visitor_);
     client->Connect();
     return client;
@@ -613,7 +609,6 @@
   ParsedQuicVersion negotiated_version_;
   size_t chlo_multiplier_;
   QuicTestServer::StreamFactory* stream_factory_;
-  bool support_server_push_;
   std::string pre_shared_key_client_;
   std::string pre_shared_key_server_;
   int override_server_connection_id_length_ = -1;
@@ -3089,6 +3084,7 @@
   EXPECT_EQ(trailers, client_->response_trailers());
 }
 
+// TODO(b/151749109): Test server push for IETF QUIC.
 class EndToEndTestServerPush : public EndToEndTest {
  protected:
   const size_t kNumMaxStreams = 10;
@@ -3098,7 +3094,6 @@
     server_config_.SetMaxBidirectionalStreamsToSend(kNumMaxStreams);
     client_config_.SetMaxUnidirectionalStreamsToSend(kNumMaxStreams);
     server_config_.SetMaxUnidirectionalStreamsToSend(kNumMaxStreams);
-    support_server_push_ = true;
   }
 
   // Add a request with its response and |num_resources| push resources into

quic/core/http/quic_headers_stream_test.cc

diff --git a/quic/core/http/quic_headers_stream_test.cc b/quic/core/http/quic_headers_stream_test.cc
index 9459351..9395a70 100644
--- a/quic/core/http/quic_headers_stream_test.cc
+++ b/quic/core/http/quic_headers_stream_test.cc
@@ -403,8 +403,6 @@
 }
 
 TEST_P(QuicHeadersStreamTest, WritePushPromises) {
-  session_.SetMaxAllowedPushId(kMaxQuicStreamId);
-
   for (QuicStreamId stream_id = client_id_1_; stream_id < client_id_3_;
        stream_id += next_stream_id_) {
     QuicStreamId promised_stream_id = NextPromisedStreamId();