commit ac3b4e07aa6f62fc66bf008f31c18ad5765deeed
author fayang <fayang@google.com> Fri Jun 05 08:46:54 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Jun 05 08:47:58 2020 -0700
tree d57997e8e3f7af88daad70961f78ee35105f1941
parent 573ac768f1affdbd95081e7e97bb3fc4ca7ed21f

Automated g4 rollback of changelist 314796960.

*** Reason for rollback ***

Break GFE QUIC loadtesting.

*** Original change description ***

Wait for pending ACKs to be flushed in QuicTestClient::WaitUntil and  QuicTestClient::WaitForWriteToFlush to avoid server's unnecessary retransmission in tests.

***

PiperOrigin-RevId: 314934718
Change-Id: Ia06d9a82c25631e29146b041d579ee4ac3dc9a3a

quic/test_tools/quic_test_client.cc

diff --git a/quic/test_tools/quic_test_client.cc b/quic/test_tools/quic_test_client.cc
index df54c21..9c1c4f3 100644
--- a/quic/test_tools/quic_test_client.cc
+++ b/quic/test_tools/quic_test_client.cc
@@ -661,9 +661,7 @@
           ->GetClock();
   QuicTime end_waiting_time =
       clock->Now() + QuicTime::Delta::FromMicroseconds(timeout_us);
-  while ((HaveActiveStream() ||
-          client()->session()->connection()->HasPendingAcks()) &&
-         !(trigger && trigger()) &&
+  while (HaveActiveStream() && !(trigger && trigger()) &&
          (timeout_us < 0 || clock->Now() < end_waiting_time)) {
     client_->WaitForEvents();
   }
@@ -847,8 +845,7 @@
 }
 
 void QuicTestClient::WaitForWriteToFlush() {
-  while (connected() && (client()->session()->HasDataToWrite() ||
-                         client()->session()->connection()->HasPendingAcks())) {
+  while (connected() && client()->session()->HasDataToWrite()) {
     client_->WaitForEvents();
   }
 }