gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

fix go vet warning

Browse Source
This commit is contained in:
Lucas Clemente
2016-08-06 14:30:03 +02:00
parent 100f04f242
commit 2097509d16
3 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ackhandler/sent_packet_handler_test.go
View File

@@ -677,7 +677,7 @@ var _ = Describe("SentPacketHandler", func() {
// rttUpdated, bytesInFlight, ackedPackets, lostPackets // rttUpdated, bytesInFlight, ackedPackets, lostPackets
Expect(cong.argsOnCongestionEvent[0]).To(BeTrue()) Expect(cong.argsOnCongestionEvent[0]).To(BeTrue())
Expect(cong.argsOnCongestionEvent[1]).To(Equal(protocol.ByteCount(2))) Expect(cong.argsOnCongestionEvent[1]).To(Equal(protocol.ByteCount(2)))
Expect(cong.argsOnCongestionEvent[2]).To(Equal(congestion.PacketVector{{1, 1}, {3, 3}})) Expect(cong.argsOnCongestionEvent[2]).To(Equal(congestion.PacketVector{{Number: 1, Length: 1}, {Number: 3, Length: 3}}))
Expect(cong.argsOnCongestionEvent[3]).To(BeEmpty()) Expect(cong.argsOnCongestionEvent[3]).To(BeEmpty())
// Loose the packet // Loose the packet
@@ -697,8 +697,8 @@ var _ = Describe("SentPacketHandler", func() {
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
} }
Expect(cong.argsOnCongestionEvent[2]).To(Equal(congestion.PacketVector{{packetNumber, protocol.ByteCount(packetNumber)}})) Expect(cong.argsOnCongestionEvent[2]).To(Equal(congestion.PacketVector{{Number: packetNumber, Length: protocol.ByteCount(packetNumber)}}))
Expect(cong.argsOnCongestionEvent[3]).To(Equal(congestion.PacketVector{{2, 2}})) Expect(cong.argsOnCongestionEvent[3]).To(Equal(congestion.PacketVector{{Number: 2, Length: 2}}))
}) })
It("allows or denies sending", func() { It("allows or denies sending", func() {
@@ -718,7 +718,7 @@ var _ = Describe("SentPacketHandler", func() {
Expect(cong.argsOnCongestionEvent[0]).To(BeFalse()) Expect(cong.argsOnCongestionEvent[0]).To(BeFalse())
Expect(cong.argsOnCongestionEvent[1]).To(Equal(protocol.ByteCount(1))) Expect(cong.argsOnCongestionEvent[1]).To(Equal(protocol.ByteCount(1)))
Expect(cong.argsOnCongestionEvent[2]).To(BeEmpty()) Expect(cong.argsOnCongestionEvent[2]).To(BeEmpty())
Expect(cong.argsOnCongestionEvent[3]).To(Equal(congestion.PacketVector{{1, 1}})) Expect(cong.argsOnCongestionEvent[3]).To(Equal(congestion.PacketVector{{Number: 1, Length: 1}}))
Expect(cong.onRetransmissionTimeout).To(BeTrue()) Expect(cong.onRetransmissionTimeout).To(BeTrue())
}) })
}) })

12
ackhandlerlegacy/sent_packet_handler_test.go
View File

@@ -673,7 +673,7 @@ var _ = Describe("SentPacketHandler", func() {
handler.SentPacket(&Packet{PacketNumber: 3, Frames: []frames.Frame{}, Length: 3}) handler.SentPacket(&Packet{PacketNumber: 3, Frames: []frames.Frame{}, Length: 3})
ack := frames.AckFrameLegacy{ ack := frames.AckFrameLegacy{
LargestObserved: 3, LargestObserved: 3,
NackRanges: []frames.NackRange{{2, 2}}, NackRanges: []frames.NackRange{{FirstPacketNumber: 2, LastPacketNumber: 2}},
} }
err := handler.ReceivedAck(&frames.AckFrame{AckFrameLegacy: &ack}, 1) err := handler.ReceivedAck(&frames.AckFrame{AckFrameLegacy: &ack}, 1)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
@@ -681,7 +681,7 @@ var _ = Describe("SentPacketHandler", func() {
// rttUpdated, bytesInFlight, ackedPackets, lostPackets // rttUpdated, bytesInFlight, ackedPackets, lostPackets
Expect(cong.argsOnCongestionEvent[0]).To(BeTrue()) Expect(cong.argsOnCongestionEvent[0]).To(BeTrue())
Expect(cong.argsOnCongestionEvent[1]).To(Equal(protocol.ByteCount(2))) Expect(cong.argsOnCongestionEvent[1]).To(Equal(protocol.ByteCount(2)))
Expect(cong.argsOnCongestionEvent[2]).To(Equal(congestion.PacketVector{{1, 1}, {3, 3}})) Expect(cong.argsOnCongestionEvent[2]).To(Equal(congestion.PacketVector{{Number: 1, Length: 1}, {Number: 3, Length: 3}}))
Expect(cong.argsOnCongestionEvent[3]).To(BeEmpty()) Expect(cong.argsOnCongestionEvent[3]).To(BeEmpty())
// Loose the packet // Loose the packet
@@ -691,14 +691,14 @@ var _ = Describe("SentPacketHandler", func() {
handler.SentPacket(&Packet{PacketNumber: packetNumber, Frames: []frames.Frame{}, Length: protocol.ByteCount(packetNumber)}) handler.SentPacket(&Packet{PacketNumber: packetNumber, Frames: []frames.Frame{}, Length: protocol.ByteCount(packetNumber)})
ack := frames.AckFrameLegacy{ ack := frames.AckFrameLegacy{
LargestObserved: packetNumber, LargestObserved: packetNumber,
NackRanges: []frames.NackRange{{2, 2}}, NackRanges: []frames.NackRange{{FirstPacketNumber: 2, LastPacketNumber: 2}},
} }
err = handler.ReceivedAck(&frames.AckFrame{AckFrameLegacy: &ack}, protocol.PacketNumber(2+i)) err = handler.ReceivedAck(&frames.AckFrame{AckFrameLegacy: &ack}, protocol.PacketNumber(2+i))
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
} }
Expect(cong.argsOnCongestionEvent[2]).To(Equal(congestion.PacketVector{{packetNumber, protocol.ByteCount(packetNumber)}})) Expect(cong.argsOnCongestionEvent[2]).To(Equal(congestion.PacketVector{{Number: packetNumber, Length: protocol.ByteCount(packetNumber)}}))
Expect(cong.argsOnCongestionEvent[3]).To(Equal(congestion.PacketVector{{2, 2}})) Expect(cong.argsOnCongestionEvent[3]).To(Equal(congestion.PacketVector{{Number: 2, Length: 2}}))
}) })
It("allows or denies sending", func() { It("allows or denies sending", func() {
@@ -718,7 +718,7 @@ var _ = Describe("SentPacketHandler", func() {
Expect(cong.argsOnCongestionEvent[0]).To(BeFalse()) Expect(cong.argsOnCongestionEvent[0]).To(BeFalse())
Expect(cong.argsOnCongestionEvent[1]).To(Equal(protocol.ByteCount(1))) Expect(cong.argsOnCongestionEvent[1]).To(Equal(protocol.ByteCount(1)))
Expect(cong.argsOnCongestionEvent[2]).To(BeEmpty()) Expect(cong.argsOnCongestionEvent[2]).To(BeEmpty())
Expect(cong.argsOnCongestionEvent[3]).To(Equal(congestion.PacketVector{{1, 1}})) Expect(cong.argsOnCongestionEvent[3]).To(Equal(congestion.PacketVector{{Number: 1, Length: 1}}))
Expect(cong.onRetransmissionTimeout).To(BeTrue()) Expect(cong.onRetransmissionTimeout).To(BeTrue())
}) })

30
h2quic/request_test.go
View File

@@ -12,9 +12,9 @@ import (
var _ = Describe("Request", func() { var _ = Describe("Request", func() {
It("populates request", func() { It("populates request", func() {
headers := []hpack.HeaderField{ headers := []hpack.HeaderField{
{":path", "/foo", false}, {Name: ":path", Value: "/foo"},
{":authority", "quic.clemente.io", false}, {Name: ":authority", Value: "quic.clemente.io"},
{":method", "GET", false}, {Name: ":method", Value: "GET"},
} }
req, err := requestFromHeaders(headers) req, err := requestFromHeaders(headers)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
@@ -31,12 +31,12 @@ var _ = Describe("Request", func() {
It("handles other headers", func() { It("handles other headers", func() {
headers := []hpack.HeaderField{ headers := []hpack.HeaderField{
{":path", "/foo", false}, {Name: ":path", Value: "/foo"},
{":authority", "quic.clemente.io", false}, {Name: ":authority", Value: "quic.clemente.io"},
{":method", "GET", false}, {Name: ":method", Value: "GET"},
{"content-length", "42", false}, {Name: "content-length", Value: "42"},
{"duplicate-header", "1", false}, {Name: "duplicate-header", Value: "1"},
{"duplicate-header", "2", false}, {Name: "duplicate-header", Value: "2"},
} }
req, err := requestFromHeaders(headers) req, err := requestFromHeaders(headers)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
@@ -48,8 +48,8 @@ var _ = Describe("Request", func() {
It("errors with missing path", func() { It("errors with missing path", func() {
headers := []hpack.HeaderField{ headers := []hpack.HeaderField{
{":authority", "quic.clemente.io", false}, {Name: ":authority", Value: "quic.clemente.io"},
{":method", "GET", false}, {Name: ":method", Value: "GET"},
} }
_, err := requestFromHeaders(headers) _, err := requestFromHeaders(headers)
Expect(err).To(MatchError(":path, :authority and :method must not be empty")) Expect(err).To(MatchError(":path, :authority and :method must not be empty"))
@@ -57,8 +57,8 @@ var _ = Describe("Request", func() {
It("errors with missing method", func() { It("errors with missing method", func() {
headers := []hpack.HeaderField{ headers := []hpack.HeaderField{
{":path", "/foo", false}, {Name: ":path", Value: "/foo"},
{":authority", "quic.clemente.io", false}, {Name: ":authority", Value: "quic.clemente.io"},
} }
_, err := requestFromHeaders(headers) _, err := requestFromHeaders(headers)
Expect(err).To(MatchError(":path, :authority and :method must not be empty")) Expect(err).To(MatchError(":path, :authority and :method must not be empty"))
@@ -66,8 +66,8 @@ var _ = Describe("Request", func() {
It("errors with missing authority", func() { It("errors with missing authority", func() {
headers := []hpack.HeaderField{ headers := []hpack.HeaderField{
{":path", "/foo", false}, {Name: ":path", Value: "/foo"},
{":method", "GET", false}, {Name: ":method", Value: "GET"},
} }
_, err := requestFromHeaders(headers) _, err := requestFromHeaders(headers)
Expect(err).To(MatchError(":path, :authority and :method must not be empty")) Expect(err).To(MatchError(":path, :authority and :method must not be empty"))