Enable end-to-end tests for QUIC stateless rejects when they will not involve version negotiation.

net/tools/quic/end_to_end_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 #include <string>
 #include <sys/epoll.h>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 146 matching lines @@
   }
 
   vector<TestParams> params;
   // TODO(rtenneti): Add kTBBR after BBR code is checked in.
   // for (const QuicTag congestion_control_tag : {kRENO, kTBBR, kQBIC}) {
   for (const QuicTag congestion_control_tag : {kRENO, kQBIC}) {
     for (const bool use_fec : {false, true}) {
       for (const QuicVersionVector& client_versions : client_version_buckets) {
         // A number of end to end tests fail when stateless rejects are enabled
         // *and* there are more than two QUIC versions.
-        // TODO(b/23745998) Re-enable client stateless reject support.
-        for (bool client_supports_stateless_rejects : {false}) {
-          // TODO(b/23745998) Re-enable server stateless reject support.
-          for (bool server_uses_stateless_rejects_if_peer_supported : {false}) {
+        for (bool client_supports_stateless_rejects : {true, false}) {
+          for (bool server_uses_stateless_rejects_if_peer_supported :
+               {true, false}) {
             for (bool auto_tune_flow_control_window : {true, false}) {
               CHECK(!client_versions.empty());
               // Add an entry for server and client supporting all versions.
               params.push_back(TestParams(
                   client_versions, all_supported_versions,
                   client_versions.front(), use_fec,
                   client_supports_stateless_rejects,
                   server_uses_stateless_rejects_if_peer_supported,
                   congestion_control_tag, auto_tune_flow_control_window));
+              if (client_supports_stateless_rejects &&
+                  server_uses_stateless_rejects_if_peer_supported) {
+                // TODO(b/23745998) Make stateless reject work with version
+                // negotiation.
+                continue;
+              }
 
               // Test client supporting all versions and server supporting 1
               // version. Simulate an old server and exercise version downgrade
               // in the client. Protocol negotiation should occur. Skip the i =
               // 0 case because it is essentially the same as the default case.
               for (const QuicVersion version : client_versions) {
                 QuicVersionVector server_supported_versions;
                 server_supported_versions.push_back(version);
                 params.push_back(TestParams(
                     client_versions, server_supported_versions,
@@ skipping 1896 matching lines @@
     // There will be buffered data to write in the client's stream.
     ReliableQuicStream* stream = client_->client()->session()->GetStream(5);
     EXPECT_TRUE(stream != nullptr && stream->HasBufferedData());
   }
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace tools
 }  // namespace net