commit 416168464c9f3217d556208b67d510580f87da80
author dschinazi <dschinazi@google.com> Tue Jan 21 15:46:11 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Tue Jan 21 15:46:46 2020 -0800
tree bcecc8e184305727c86ec81b17dcd410a63eaa30
parent f579b5e51aaf2224e9c80ff1fb4606492bd0cba4

Remove QUIC version Q099

(I took over cl/285250934 from ianswett@ to load-balance)

This CL deprecates gfe2_reloadable_flag_quic_enable_q099 false, because it is blocked and will never be enabled.

gfe-relnote: n/a (Deprecate blocked flag)
PiperOrigin-RevId: 290839787
Change-Id: I319337542735b8df2d8bf862f0c2624adf01c343

quic/core/quic_versions_test.cc

diff --git a/quic/core/quic_versions_test.cc b/quic/core/quic_versions_test.cc
index cbaab95..f397d7e 100644
--- a/quic/core/quic_versions_test.cc
+++ b/quic/core/quic_versions_test.cc
@@ -42,8 +42,11 @@
   // default case (i.e. all supported versions should be successfully converted
   // to valid QuicVersionLabels).
   for (size_t i = 0; i < QUICHE_ARRAYSIZE(kSupportedTransportVersions); ++i) {
-    QuicTransportVersion version = kSupportedTransportVersions[i];
-    EXPECT_LT(0u, QuicVersionToQuicVersionLabel(version));
+    QuicTransportVersion transport_version = kSupportedTransportVersions[i];
+    if (!ParsedQuicVersionIsValid(PROTOCOL_QUIC_CRYPTO, transport_version)) {
+      continue;
+    }
+    EXPECT_LT(0u, QuicVersionToQuicVersionLabel(transport_version));
   }
 }
 
@@ -83,16 +86,20 @@
             QuicVersionLabelToQuicVersion(MakeQuicTag('3', '4', '0', 'Q')));
 
   for (size_t i = 0; i < QUICHE_ARRAYSIZE(kSupportedTransportVersions); ++i) {
-    QuicTransportVersion version = kSupportedTransportVersions[i];
+    QuicTransportVersion transport_version = kSupportedTransportVersions[i];
+    if (!ParsedQuicVersionIsValid(PROTOCOL_QUIC_CRYPTO, transport_version)) {
+      continue;
+    }
 
     // Get the label from the version (we can loop over QuicVersions easily).
-    QuicVersionLabel version_label = QuicVersionToQuicVersionLabel(version);
+    QuicVersionLabel version_label =
+        QuicVersionToQuicVersionLabel(transport_version);
     EXPECT_LT(0u, version_label);
 
     // Now try converting back.
     QuicTransportVersion label_to_transport_version =
         QuicVersionLabelToQuicVersion(version_label);
-    EXPECT_EQ(version, label_to_transport_version);
+    EXPECT_EQ(transport_version, label_to_transport_version);
     EXPECT_NE(QUIC_VERSION_UNSUPPORTED, label_to_transport_version);
   }
 }
@@ -264,7 +271,6 @@
 TEST_F(QuicVersionsTest, FilterSupportedVersionsAllVersions) {
   static_assert(QUICHE_ARRAYSIZE(kSupportedTransportVersions) == 6u,
                 "Supported versions out of sync");
-  SetQuicReloadableFlag(quic_enable_version_q099, true);
   SetQuicReloadableFlag(quic_enable_version_t099, true);
   SetQuicReloadableFlag(quic_enable_version_t050, true);
   SetQuicReloadableFlag(quic_disable_version_q050, false);
@@ -275,8 +281,6 @@
 
   ParsedQuicVersionVector expected_parsed_versions;
   expected_parsed_versions.push_back(
-      ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_99));
-  expected_parsed_versions.push_back(
       ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_50));
   expected_parsed_versions.push_back(
       ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_49));
@@ -299,7 +303,6 @@
 TEST_F(QuicVersionsTest, FilterSupportedVersionsNo99) {
   static_assert(QUICHE_ARRAYSIZE(kSupportedTransportVersions) == 6u,
                 "Supported versions out of sync");
-  SetQuicReloadableFlag(quic_enable_version_q099, false);
   SetQuicReloadableFlag(quic_enable_version_t099, false);
   SetQuicReloadableFlag(quic_enable_version_t050, true);
   SetQuicReloadableFlag(quic_disable_version_q050, false);
@@ -329,7 +332,6 @@
 TEST_F(QuicVersionsTest, FilterSupportedVersionsNoFlags) {
   static_assert(QUICHE_ARRAYSIZE(kSupportedTransportVersions) == 6u,
                 "Supported versions out of sync");
-  SetQuicReloadableFlag(quic_enable_version_q099, false);
   SetQuicReloadableFlag(quic_enable_version_t099, false);
   SetQuicReloadableFlag(quic_enable_version_t050, false);
   SetQuicReloadableFlag(quic_disable_version_q050, false);
@@ -429,8 +431,6 @@
 TEST_F(QuicVersionsTest, QuicEnableVersion) {
   static_assert(QUICHE_ARRAYSIZE(kSupportedTransportVersions) == 6u,
                 "Supported versions out of sync");
-  ParsedQuicVersion parsed_version_q099 =
-      ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_99);
   ParsedQuicVersion parsed_version_t099 =
       ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_99);
   ParsedQuicVersion parsed_version_q050 =
@@ -440,13 +440,6 @@
 
   {
     QuicFlagSaver flag_saver;
-    SetQuicReloadableFlag(quic_enable_version_q099, false);
-    QuicEnableVersion(parsed_version_q099);
-    EXPECT_TRUE(GetQuicReloadableFlag(quic_enable_version_q099));
-  }
-
-  {
-    QuicFlagSaver flag_saver;
     SetQuicReloadableFlag(quic_enable_version_t099, false);
     QuicEnableVersion(parsed_version_t099);
     EXPECT_TRUE(GetQuicReloadableFlag(quic_enable_version_t099));