From 6c7fbc4a79f1ce30e9e0a7b5de935aa9e97a3207 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Mon, 19 Nov 2018 15:08:08 +0700 Subject: [PATCH] remove special case for testing when receiving packets in the session --- session.go | 6 +----- session_test.go | 8 ++++---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/session.go b/session.go index c6d782907..e319cfa07 100644 --- a/session.go +++ b/session.go @@ -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, diff --git a/session_test.go b/session_test.go index 675e2eb9d..5bdc3593c 100644 --- a/session_test.go +++ b/session_test.go @@ -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() {