commit 8288466f30063d6f9db5e99e43f451d3e9850623
author dschinazi <dschinazi@google.com> Fri Aug 02 13:25:15 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Aug 05 09:07:33 2019 -0700
tree 6c3da5072583cb11ed754dfce12110f6165803e8
parent 309987e49ff24991aa102c3085a1456fc867b299

Enable more TLS stateless reset tests

This is a followup to cl/261368686. This CL enables the remaining stateless reset tests that used to be disabled when using TLS.

gfe-relnote: n/a, test-only
PiperOrigin-RevId: 261379774
Change-Id: I7f4f243d547898c04b0a72df952b3dea0e1d66b2

quic/core/http/end_to_end_test.cc

diff --git a/quic/core/http/end_to_end_test.cc b/quic/core/http/end_to_end_test.cc
index 702dd70..c61c347 100644
--- a/quic/core/http/end_to_end_test.cc
+++ b/quic/core/http/end_to_end_test.cc
@@ -2483,16 +2483,9 @@
   EXPECT_TRUE(client_->client()->WaitForCryptoHandshakeConfirmed());
   QuicConnection* client_connection =
       client_->client()->client_session()->connection();
-  if (SupportsIetfQuicWithTls(client_connection->version())) {
-    // TLS handshake does not support stateless reset token yet.
-    return;
-  }
-  QuicUint128 stateless_reset_token = 0;
-  if (client_connection->version().handshake_protocol == PROTOCOL_QUIC_CRYPTO) {
-    QuicConfig* config = client_->client()->session()->config();
-    EXPECT_TRUE(config->HasReceivedStatelessResetToken());
-    stateless_reset_token = config->ReceivedStatelessResetToken();
-  }
+  QuicConfig* config = client_->client()->session()->config();
+  EXPECT_TRUE(config->HasReceivedStatelessResetToken());
+  QuicUint128 stateless_reset_token = config->ReceivedStatelessResetToken();
 
   // Send the public reset.
   QuicConnectionId connection_id = client_connection->connection_id();
@@ -2529,16 +2522,9 @@
   EXPECT_TRUE(client_->client()->WaitForCryptoHandshakeConfirmed());
   QuicConnection* client_connection =
       client_->client()->client_session()->connection();
-  if (SupportsIetfQuicWithTls(client_connection->version())) {
-    // TLS handshake does not support stateless reset token yet.
-    return;
-  }
-  QuicUint128 stateless_reset_token = 0;
-  if (client_connection->version().handshake_protocol == PROTOCOL_QUIC_CRYPTO) {
-    QuicConfig* config = client_->client()->session()->config();
-    EXPECT_TRUE(config->HasReceivedStatelessResetToken());
-    stateless_reset_token = config->ReceivedStatelessResetToken();
-  }
+  QuicConfig* config = client_->client()->session()->config();
+  EXPECT_TRUE(config->HasReceivedStatelessResetToken());
+  QuicUint128 stateless_reset_token = config->ReceivedStatelessResetToken();
   // Send the public reset.
   QuicConnectionId incorrect_connection_id = TestConnectionId(
       TestConnectionIdToUInt64(client_connection->connection_id()) + 1);