From ae2247c869c74f68cfe31b4d8820cf88d407527e Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Fri, 9 Mar 2018 10:24:49 +0700 Subject: [PATCH] test that exiting slow start and acking packets are done in right order --- internal/ackhandler/sent_packet_handler_test.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/ackhandler/sent_packet_handler_test.go b/internal/ackhandler/sent_packet_handler_test.go index 562676aa..6b0ccbac 100644 --- a/internal/ackhandler/sent_packet_handler_test.go +++ b/internal/ackhandler/sent_packet_handler_test.go @@ -660,17 +660,17 @@ var _ = Describe("SentPacketHandler", func() { }) It("should call MaybeExitSlowStart and OnPacketAcked", func() { - cong.EXPECT().OnPacketSent(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Times(2) - cong.EXPECT().TimeUntilSend(gomock.Any()).Times(2) - cong.EXPECT().MaybeExitSlowStart() - cong.EXPECT().OnPacketAcked( - protocol.PacketNumber(1), - protocol.ByteCount(1), - protocol.ByteCount(1), + cong.EXPECT().OnPacketSent(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Times(3) + cong.EXPECT().TimeUntilSend(gomock.Any()).Times(3) + gomock.InOrder( + cong.EXPECT().MaybeExitSlowStart(), // must be called before packets are acked + cong.EXPECT().OnPacketAcked(protocol.PacketNumber(1), protocol.ByteCount(1), protocol.ByteCount(2)), + cong.EXPECT().OnPacketAcked(protocol.PacketNumber(2), protocol.ByteCount(1), protocol.ByteCount(1)), ) handler.SentPacket(retransmittablePacket(1)) handler.SentPacket(retransmittablePacket(2)) - err := handler.ReceivedAck(&wire.AckFrame{LargestAcked: 1, LowestAcked: 1}, 1, protocol.EncryptionForwardSecure, time.Now()) + handler.SentPacket(retransmittablePacket(3)) + err := handler.ReceivedAck(&wire.AckFrame{LargestAcked: 2, LowestAcked: 1}, 1, protocol.EncryptionForwardSecure, time.Now()) Expect(err).NotTo(HaveOccurred()) })