Landing Recent QUIC changes until 9:58 AM, Sep 17, 2016 UTC

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 <sys/epoll.h>
 
 #include <list>
 #include <memory>
 #include <string>
@@ skipping 269 matching lines @@
                           client_versions, server_supported_versions,
                           server_supported_versions.front(),
                           client_supports_stateless_rejects,
                           server_uses_stateless_rejects_if_peer_supported,
                           congestion_control_tag, disable_hpack_dynamic_table,
                           force_hol_blocking, use_cheap_stateless_reject,
                           buffer_packet_till_chlo, small_client_mtu));
                     }  // End of version for loop.
                   }    // End of 2nd version for loop.
                 }      // End of small_client_mtu loop.
-              }      // End of buffer_packet_till_chlo loop.
-            }        // End of use_cheap_stateless_reject for loop.
-          }          // End of force_hol_blocking loop.
-        }            // End of disable_hpack_dynamic_table for loop.
-      }              // End of congestion_control_tag for loop.
-    }                // End of client_supports_stateless_rejects for loop.
+              }        // End of buffer_packet_till_chlo loop.
+            }          // End of use_cheap_stateless_reject for loop.
+          }            // End of force_hol_blocking loop.
+        }              // End of disable_hpack_dynamic_table for loop.
+      }                // End of congestion_control_tag for loop.
+    }                  // End of client_supports_stateless_rejects for loop.
     CHECK_EQ(kMaxEnabledOptions, max_enabled_options);
   }  // End of server_uses_stateless_rejects_if_peer_supported for loop.
   return params;
 }
 
 class SmallMtuPacketReader : public QuicPacketReader {
  public:
   bool ReadAndDispatchPackets(int fd,
                               int port,
                               bool potentially_small_mtu,
@@ skipping 1046 matching lines @@
   FLAGS_quic_enable_multipath = false;
   ASSERT_TRUE(Initialize());
   client_->client()->WaitForCryptoHandshakeConfirmed();
 
   CongestionControlType expected_congestion_control_type = kReno;
   switch (GetParam().congestion_control_tag) {
     case kRENO:
       expected_congestion_control_type = kReno;
       break;
     case kTBBR:
-      expected_congestion_control_type = kBBR;
+      // TODO(vasilvv): switch this back to kBBR when new BBR implementation is
+      // in.
+      expected_congestion_control_type = kCubic;
       break;
     case kQBIC:
       expected_congestion_control_type = kCubic;
       break;
     default:
       DLOG(FATAL) << "Unexpected congestion control tag";
   }
 
   server_thread_->Pause();
   EXPECT_EQ(expected_congestion_control_type,
@@ skipping 1386 matching lines @@
   }
 
   // Because of server push, client gets all pushed resources without actually
   // sending requests for them.
   EXPECT_EQ(1u, client_->num_requests());
   // Including response to original request, 12 responses in total were
   // recieved.
   EXPECT_EQ(12u, client_->num_responses());
 }
 
+// TODO(ckrasic) - remove this when deprecating
+// FLAGS_quic_enable_server_push_by_default.
 TEST_P(EndToEndTestServerPush, DisabledWithoutConnectionOption) {
+  FLAGS_quic_enable_server_push_by_default = false;
   // Tests that server push won't be triggered when kSPSH is not set by client.
   support_server_push_ = false;
   ASSERT_TRUE(Initialize());
 
   // Add a response with headers, body, and push resources.
   const string kBody = "body content";
   size_t const kNumResources = 4;
   string push_urls[] = {
       "https://example.com/font.woff", "https://example.com/script.js",
       "https://fonts.example.com/font.woff",
@@ skipping 143 matching lines @@
   EXPECT_EQ(kBarResponseBody, client_->response_body());
   QuicConnectionStats client_stats =
       client_->client()->session()->connection()->GetStats();
   EXPECT_EQ(0u, client_stats.packets_lost);
   EXPECT_EQ(1, client_->client()->GetNumSentClientHellos());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net