Merge pull request #1611 from lucas-clemente/simplify-packet-receiving

remove special case for testing when receiving packets in the session
This commit is contained in:
Marten Seemann
2018-11-19 20:43:39 +07:00
committed by GitHub
2 changed files with 5 additions and 9 deletions

View File

@@ -487,11 +487,7 @@ func (s *session) handlePacketImpl(p *receivedPacket) error {
return nil
}
if p.rcvTime.IsZero() {
// To simplify testing
p.rcvTime = time.Now()
}
p.rcvTime = time.Now()
// Calculate packet number
hdr.PacketNumber = protocol.InferPacketNumber(
hdr.PacketNumberLen,

View File

@@ -468,13 +468,13 @@ var _ = Describe("Session", func() {
It("informs the ReceivedPacketHandler", func() {
unpacker.EXPECT().Unpack(gomock.Any(), gomock.Any(), gomock.Any()).Return(&unpackedPacket{}, nil)
now := time.Now().Add(time.Hour)
rph := mockackhandler.NewMockReceivedPacketHandler(mockCtrl)
rph.EXPECT().ReceivedPacket(protocol.PacketNumber(5), now, false)
rph.EXPECT().ReceivedPacket(protocol.PacketNumber(5), gomock.Any(), false).Do(func(_ protocol.PacketNumber, t time.Time, _ bool) {
Expect(t).To(BeTemporally("~", time.Now(), scaleDuration(25*time.Millisecond)))
})
sess.receivedPacketHandler = rph
hdr.PacketNumber = 5
err := sess.handlePacketImpl(&receivedPacket{header: hdr, rcvTime: now})
Expect(err).ToNot(HaveOccurred())
Expect(sess.handlePacketImpl(&receivedPacket{header: hdr})).To(Succeed())
})
It("doesn't inform the ReceivedPacketHandler about Retry packets", func() {