commit e30a3438d0cb2324519c14b4d2368db1494b0406
author bnc <bnc@google.com> Tue May 12 07:07:43 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Tue May 12 07:08:27 2020 -0700
tree 0b6596bb04004190cb33f56472d7f83631a32cbc
parent 8b561471358b01d9a3862b533858668ef9fff3cd

Re-enable TLS for EndToEndTest.AckNotifierWithPacketLossAndBlockedSocket.

This was an issue with QPACK, not TLS, but since currently every QUIC version
using QPACK also uses TLS, this test being disabled for TLS hid the underlying
issue.

This was caused by cl/309141996, which enabled the QPACK dynamic table for the
test client and server.  This CL fixes the test by enabling the dynamic table
for the local QpackEncoder instance that is solely used to predict the size of
the compressed headers.

Also fix the obsolete class comment for TestAckListener.

Test-only change.

PiperOrigin-RevId: 311118418
Change-Id: I4eb6b29e9f0a3ed8864babdb4200b54b85c8b17b

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 a3089cd..786e853 100644
--- a/quic/core/http/end_to_end_test.cc
+++ b/quic/core/http/end_to_end_test.cc
@@ -2353,8 +2353,8 @@
   server_thread_->Resume();
 }
 
-// A TestAckListener verifies that its OnAckNotification method has been
-// called exactly once on destruction.
+// A TestAckListener verifies that exactly |bytes_to_ack| bytes are acked during
+// its lifetime.
 class TestAckListener : public QuicAckListenerInterface {
  public:
   explicit TestAckListener(int bytes_to_ack) : bytes_to_ack_(bytes_to_ack) {}
@@ -2393,11 +2393,6 @@
   // socket,  an AckNotifierDelegate will get informed that the data it is
   // interested in has been ACKed. This tests end-to-end ACK notification, and
   // demonstrates that retransmissions do not break this functionality.
-  if (version_.UsesTls()) {
-    // TODO(b/155489419): Enable this test for TLS.
-    Initialize();
-    return;
-  }
   SetPacketLossPercentage(5);
   ASSERT_TRUE(Initialize());
 
@@ -2428,6 +2423,12 @@
     QpackEncoder qpack_encoder(&decoder_stream_error_delegate);
     qpack_encoder.set_qpack_stream_sender_delegate(
         &encoder_stream_sender_delegate);
+
+    qpack_encoder.SetMaximumDynamicTableCapacity(
+        kDefaultQpackMaxDynamicTableCapacity);
+    qpack_encoder.SetDynamicTableCapacity(kDefaultQpackMaxDynamicTableCapacity);
+    qpack_encoder.SetMaximumBlockedStreams(kDefaultMaximumBlockedStreams);
+
     std::string encoded_headers =
         qpack_encoder.EncodeHeaderList(/* stream_id = */ 0, headers, nullptr);
     header_size = encoded_headers.size();