commit 58f71077f51b513dd48dfb4615f3280df697342e
author fayang <fayang@google.com> Tue Nov 05 08:47:02 2019 -0800
committer Copybara-Service <copybara-worker@google.com> Tue Nov 05 08:47:51 2019 -0800
tree 02c7116f7aa2dfc9ff2fc62c8e901176706b54b3
parent 5a5661f9da6fa251d421179cf77271dc4d116065

gfe-relnote: In QUIC T049+, support sending coalesced packets.

PiperOrigin-RevId: 278634718
Change-Id: If6eadcb1a165e0cf4993f60d3a4faeb108fe8ccb

quic/core/quic_packet_creator_test.cc

diff --git a/quic/core/quic_packet_creator_test.cc b/quic/core/quic_packet_creator_test.cc
index 0ba7bd1..4efcbfe 100644
--- a/quic/core/quic_packet_creator_test.cc
+++ b/quic/core/quic_packet_creator_test.cc
@@ -539,8 +539,10 @@
     // If there is not enough space in the packet to fit a padding frame
     // (1 byte) and to expand the stream frame (another 2 bytes) the packet
     // will not be padded.
-    if (bytes_free < 3 &&
-        !QuicVersionUsesCryptoFrames(client_framer_.transport_version())) {
+    // Padding is skipped when we try to send coalesced packets.
+    if ((bytes_free < 3 &&
+         !QuicVersionUsesCryptoFrames(client_framer_.transport_version())) ||
+        client_framer_.version().CanSendCoalescedPackets()) {
       EXPECT_EQ(kDefaultMaxPacketSize - bytes_free,
                 serialized_packet_.encrypted_length);
     } else {
@@ -2072,7 +2074,8 @@
 }
 
 TEST_P(QuicPacketCreatorTest, SaveNonRetransmittableFrames) {
-  if (!GetQuicReloadableFlag(quic_populate_nonretransmittable_frames)) {
+  if (!GetQuicReloadableFlag(quic_populate_nonretransmittable_frames) &&
+      !client_framer_.version().CanSendCoalescedPackets()) {
     return;
   }
   QuicAckFrame ack_frame(InitAckFrame(1));