Disable TLS in YperfChannelTest
This will allow us to reorder TLS versions ahead of QUIC_CRYPTO.
This CL also creates quic::test::DisableQuicVersionsWithTls() and adopts it from the quartc tests that are similarly broken with TLS.
gfe-relnote: n/a, test-only
PiperOrigin-RevId: 305279786
Change-Id: I39d1d1209fe16165a0a8c26abc6df0230b552367
diff --git a/quic/quartc/quartc_multiplexer_test.cc b/quic/quartc/quartc_multiplexer_test.cc
index fcdbe99..024b67d 100644
--- a/quic/quartc/quartc_multiplexer_test.cc
+++ b/quic/quartc/quartc_multiplexer_test.cc
@@ -202,9 +202,7 @@
quic::QuartcSessionConfig())) {
// TODO(b/150224094): Re-enable TLS handshake.
// TODO(b/150236522): Parametrize by QUIC version.
- SetQuicReloadableFlag(quic_enable_version_draft_27, false);
- SetQuicReloadableFlag(quic_enable_version_draft_25_v3, false);
- SetQuicReloadableFlag(quic_enable_version_t050, false);
+ quic::test::DisableQuicVersionsWithTls();
}
void Connect() {
diff --git a/quic/quartc/quartc_session_test.cc b/quic/quartc/quartc_session_test.cc
index 4731205..93172e7 100644
--- a/quic/quartc/quartc_session_test.cc
+++ b/quic/quartc/quartc_session_test.cc
@@ -56,9 +56,7 @@
void Init(bool create_client_endpoint = true) {
// TODO(b/150224094): Re-enable TLS handshake.
// TODO(b/150236522): Parametrize by QUIC version.
- SetQuicReloadableFlag(quic_enable_version_draft_27, false);
- SetQuicReloadableFlag(quic_enable_version_draft_25_v3, false);
- SetQuicReloadableFlag(quic_enable_version_t050, false);
+ quic::test::DisableQuicVersionsWithTls();
client_transport_ =
std::make_unique<simulator::SimulatedQuartcPacketTransport>(
diff --git a/quic/quartc/test/quartc_bidi_test.cc b/quic/quartc/test/quartc_bidi_test.cc
index 371fbed..dcf5509 100644
--- a/quic/quartc/test/quartc_bidi_test.cc
+++ b/quic/quartc/test/quartc_bidi_test.cc
@@ -28,9 +28,7 @@
QuartcBidiTest() {
// TODO(b/150224094): Re-enable TLS handshake.
// TODO(b/150236522): Parametrize by QUIC version.
- SetQuicReloadableFlag(quic_enable_version_draft_27, false);
- SetQuicReloadableFlag(quic_enable_version_draft_25_v3, false);
- SetQuicReloadableFlag(quic_enable_version_t050, false);
+ quic::test::DisableQuicVersionsWithTls();
uint64_t seed = QuicRandom::GetInstance()->RandUint64();
QUIC_LOG(INFO) << "Setting random seed to " << seed;
diff --git a/quic/quartc/test/quartc_peer_test.cc b/quic/quartc/test/quartc_peer_test.cc
index 2801131..76537c2 100644
--- a/quic/quartc/test/quartc_peer_test.cc
+++ b/quic/quartc/test/quartc_peer_test.cc
@@ -44,9 +44,7 @@
QuicTime::Delta::FromMilliseconds(100)) {
// TODO(b/150224094): Re-enable TLS handshake.
// TODO(b/150236522): Parametrize by QUIC version.
- SetQuicReloadableFlag(quic_enable_version_draft_27, false);
- SetQuicReloadableFlag(quic_enable_version_draft_25_v3, false);
- SetQuicReloadableFlag(quic_enable_version_t050, false);
+ quic::test::DisableQuicVersionsWithTls();
simulator_.set_random_generator(&rng_);
}
diff --git a/quic/test_tools/quic_test_utils.cc b/quic/test_tools/quic_test_utils.cc
index d8a0436..82afd3c 100644
--- a/quic/test_tools/quic_test_utils.cc
+++ b/quic/test_tools/quic_test_utils.cc
@@ -817,6 +817,12 @@
return AllSupportedVersions().back();
}
+void DisableQuicVersionsWithTls() {
+ SetQuicReloadableFlag(quic_enable_version_draft_27, false);
+ SetQuicReloadableFlag(quic_enable_version_draft_25_v3, false);
+ SetQuicReloadableFlag(quic_enable_version_t050, false);
+}
+
QuicEncryptedPacket* ConstructEncryptedPacket(
QuicConnectionId destination_connection_id,
QuicConnectionId source_connection_id,
diff --git a/quic/test_tools/quic_test_utils.h b/quic/test_tools/quic_test_utils.h
index 8414d7b..8147dcd 100644
--- a/quic/test_tools/quic_test_utils.h
+++ b/quic/test_tools/quic_test_utils.h
@@ -50,11 +50,11 @@
// Extracts the connection number passed to TestConnectionId().
uint64_t TestConnectionIdToUInt64(QuicConnectionId connection_id);
-static const uint16_t kTestPort = 12345;
-static const uint32_t kInitialStreamFlowControlWindowForTest =
- 1024 * 1024; // 1 MB
-static const uint32_t kInitialSessionFlowControlWindowForTest =
- 1536 * 1024; // 1.5 MB
+enum : uint16_t { kTestPort = 12345 };
+enum : uint32_t {
+ kInitialStreamFlowControlWindowForTest = 1024 * 1024, // 1 MB
+ kInitialSessionFlowControlWindowForTest = 1536 * 1024, // 1.5 MB
+};
// Returns the test peer IP address.
QuicIpAddress TestPeerIPAddress();
@@ -65,6 +65,11 @@
// Lower limit on versions we support.
ParsedQuicVersion QuicVersionMin();
+// Disables all flags that enable QUIC versions that use TLS.
+// This is only meant as a temporary measure to prevent some broken tests
+// from running with TLS.
+void DisableQuicVersionsWithTls();
+
// Create an encrypted packet for testing.
// If versions == nullptr, uses &AllSupportedVersions().
// Note that the packet is encrypted with NullEncrypter, so to decrypt the
