commit 5dd7a030209f9a6b5043bebd8ac3ee54f18d1d08
author haoyuewang <haoyuewang@google.com> Fri Jul 16 16:57:57 2021 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Jul 16 16:58:44 2021 -0700
tree 41f3f68b5846e87734fc3aed358d1cc910c1fef0
parent 5b5e51b691348f5019c2effcf9b947b0e53c73d5

Fix tests broken by --gfe2_reloadable_flag_quic_ack_cid_frames

PiperOrigin-RevId: 385250079

quic/core/quic_connection_test.cc

diff --git a/quic/core/quic_connection_test.cc b/quic/core/quic_connection_test.cc
index d7d5392..076edac 100644
--- a/quic/core/quic_connection_test.cc
+++ b/quic/core/quic_connection_test.cc
@@ -12106,7 +12106,13 @@
   new_writer.SetWritable();
   // Write event on the default socket shouldn't make any difference.
   connection_.OnCanWrite();
-  EXPECT_EQ(0u, writer_->packets_write_attempts());
+  if (GetQuicReloadableFlag(quic_ack_cid_frames)) {
+    // A NEW_CONNECTION_ID frame is received in PathProbeTestInit and OnCanWrite
+    // will write a acking packet.
+    EXPECT_EQ(1u, writer_->packets_write_attempts());
+  } else {
+    EXPECT_EQ(0u, writer_->packets_write_attempts());
+  }
   EXPECT_EQ(1u, new_writer.packets_write_attempts());
 }
 
@@ -12291,6 +12297,9 @@
     return;
   }
   PathProbeTestInit(Perspective::IS_CLIENT);
+  // Make sure there is no outstanding ACK_FRAME to write.
+  connection_.OnCanWrite();
+  uint num_packets_write_attempts = writer_->packets_write_attempts();
 
   writer_->SetShouldWriteFail();
   writer_->SetWriteError(QUIC_EMSGSIZE);
@@ -12309,7 +12318,7 @@
   EXPECT_TRUE(connection_.HasPendingPathValidation());
   // Connection shouldn't be closed.
   EXPECT_TRUE(connection_.connected());
-  EXPECT_EQ(1u, writer_->packets_write_attempts());
+  EXPECT_EQ(++num_packets_write_attempts, writer_->packets_write_attempts());
   EXPECT_EQ(1u, writer_->path_challenge_frames().size());
   EXPECT_EQ(1u, writer_->padding_frames().size());
   EXPECT_EQ(kNewPeerAddress, writer_->last_write_peer_address());