Landing Recent QUIC changes until Sat Aug 13 04:32:36 2016 UTC-0

net/tools/quic/end_to_end_test.cc

Index: net/tools/quic/end_to_end_test.cc
diff --git a/net/tools/quic/end_to_end_test.cc b/net/tools/quic/end_to_end_test.cc
index 246c0aa32d762671e06ada038478ab5f9fb82e46..faed90630831e79f96a684157a1d79cca1cf8f14 100644
--- a/net/tools/quic/end_to_end_test.cc
+++ b/net/tools/quic/end_to_end_test.cc
@@ -235,6 +235,9 @@ vector<TestParams> GetTestParams() {
                 for (const QuicVersionVector& client_versions :
                      version_buckets) {
                   CHECK(!client_versions.empty());
+                  if (FilterSupportedVersions(client_versions).empty()) {
+                    continue;
+                  }
                   // Add an entry for server and client supporting all versions.
                   params.push_back(TestParams(
                       client_versions, all_supported_versions,
@@ -260,6 +263,10 @@ vector<TestParams> GetTestParams() {
                   for (size_t i = 1; i < client_versions.size(); ++i) {
                     QuicVersionVector server_supported_versions;
                     server_supported_versions.push_back(client_versions[i]);
+                    if (FilterSupportedVersions(server_supported_versions)
+                            .empty()) {
+                      continue;
+                    }
                     params.push_back(TestParams(
                         client_versions, server_supported_versions,
                         server_supported_versions.front(),
@@ -1194,7 +1201,7 @@ TEST_P(EndToEndTest, DISABLED_MultipleTermination) {
   ReliableQuicStreamPeer::SetWriteSideClosed(false,
                                              client_->GetOrCreateStream());
 
-  EXPECT_DFATAL(client_->SendData("eep", true), "Fin already buffered");
+  EXPECT_QUIC_BUG(client_->SendData("eep", true), "Fin already buffered");
 }
 
 TEST_P(EndToEndTest, Timeout) {