From 4b58bc0d077fbb515eb43f526ad784cc2fed720b Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Fri, 8 Nov 2019 11:09:54 +0700 Subject: [PATCH] make the stream deletion error message more specific --- streams_map_incoming_bidi.go | 4 ++-- streams_map_incoming_generic.go | 4 ++-- streams_map_incoming_generic_test.go | 2 +- streams_map_incoming_uni.go | 4 ++-- streams_map_outgoing_bidi.go | 2 +- streams_map_outgoing_generic.go | 2 +- streams_map_outgoing_generic_test.go | 4 ++-- streams_map_outgoing_uni.go | 2 +- streams_map_test.go | 8 ++++---- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/streams_map_incoming_bidi.go b/streams_map_incoming_bidi.go index 84f35581..aface239 100644 --- a/streams_map_incoming_bidi.go +++ b/streams_map_incoming_bidi.go @@ -139,7 +139,7 @@ func (m *incomingBidiStreamsMap) DeleteStream(num protocol.StreamNum) error { func (m *incomingBidiStreamsMap) deleteStream(num protocol.StreamNum) error { if _, ok := m.streams[num]; !ok { return streamError{ - message: "Tried to delete unknown stream %d", + message: "Tried to delete unknown incoming stream %d", nums: []protocol.StreamNum{num}, } } @@ -149,7 +149,7 @@ func (m *incomingBidiStreamsMap) deleteStream(num protocol.StreamNum) error { if num >= m.nextStreamToAccept { if _, ok := m.streamsToDelete[num]; ok { return streamError{ - message: "Tried to delete stream %d multiple times", + message: "Tried to delete incoming stream %d multiple times", nums: []protocol.StreamNum{num}, } } diff --git a/streams_map_incoming_generic.go b/streams_map_incoming_generic.go index 84a5dcc8..c6fc71f4 100644 --- a/streams_map_incoming_generic.go +++ b/streams_map_incoming_generic.go @@ -137,7 +137,7 @@ func (m *incomingItemsMap) DeleteStream(num protocol.StreamNum) error { func (m *incomingItemsMap) deleteStream(num protocol.StreamNum) error { if _, ok := m.streams[num]; !ok { return streamError{ - message: "Tried to delete unknown stream %d", + message: "Tried to delete unknown incoming stream %d", nums: []protocol.StreamNum{num}, } } @@ -147,7 +147,7 @@ func (m *incomingItemsMap) deleteStream(num protocol.StreamNum) error { if num >= m.nextStreamToAccept { if _, ok := m.streamsToDelete[num]; ok { return streamError{ - message: "Tried to delete stream %d multiple times", + message: "Tried to delete incoming stream %d multiple times", nums: []protocol.StreamNum{num}, } } diff --git a/streams_map_incoming_generic_test.go b/streams_map_incoming_generic_test.go index f62e6d5c..2434db75 100644 --- a/streams_map_incoming_generic_test.go +++ b/streams_map_incoming_generic_test.go @@ -197,7 +197,7 @@ var _ = Describe("Streams Map (incoming)", func() { It("errors when deleting a non-existing stream", func() { err := m.DeleteStream(1337) Expect(err).To(HaveOccurred()) - Expect(err.(streamError).TestError()).To(MatchError("Tried to delete unknown stream 1337")) + Expect(err.(streamError).TestError()).To(MatchError("Tried to delete unknown incoming stream 1337")) }) It("sends MAX_STREAMS frames when streams are deleted", func() { diff --git a/streams_map_incoming_uni.go b/streams_map_incoming_uni.go index 1d7f501f..9105d220 100644 --- a/streams_map_incoming_uni.go +++ b/streams_map_incoming_uni.go @@ -139,7 +139,7 @@ func (m *incomingUniStreamsMap) DeleteStream(num protocol.StreamNum) error { func (m *incomingUniStreamsMap) deleteStream(num protocol.StreamNum) error { if _, ok := m.streams[num]; !ok { return streamError{ - message: "Tried to delete unknown stream %d", + message: "Tried to delete unknown incoming stream %d", nums: []protocol.StreamNum{num}, } } @@ -149,7 +149,7 @@ func (m *incomingUniStreamsMap) deleteStream(num protocol.StreamNum) error { if num >= m.nextStreamToAccept { if _, ok := m.streamsToDelete[num]; ok { return streamError{ - message: "Tried to delete stream %d multiple times", + message: "Tried to delete incoming stream %d multiple times", nums: []protocol.StreamNum{num}, } } diff --git a/streams_map_outgoing_bidi.go b/streams_map_outgoing_bidi.go index 5178dca0..3a2a3fe4 100644 --- a/streams_map_outgoing_bidi.go +++ b/streams_map_outgoing_bidi.go @@ -155,7 +155,7 @@ func (m *outgoingBidiStreamsMap) DeleteStream(num protocol.StreamNum) error { if _, ok := m.streams[num]; !ok { return streamError{ - message: "Tried to delete unknown stream %d", + message: "Tried to delete unknown outgoing stream %d", nums: []protocol.StreamNum{num}, } } diff --git a/streams_map_outgoing_generic.go b/streams_map_outgoing_generic.go index 00914d9f..64305bde 100644 --- a/streams_map_outgoing_generic.go +++ b/streams_map_outgoing_generic.go @@ -153,7 +153,7 @@ func (m *outgoingItemsMap) DeleteStream(num protocol.StreamNum) error { if _, ok := m.streams[num]; !ok { return streamError{ - message: "Tried to delete unknown stream %d", + message: "Tried to delete unknown outgoing stream %d", nums: []protocol.StreamNum{num}, } } diff --git a/streams_map_outgoing_generic_test.go b/streams_map_outgoing_generic_test.go index 981b5b3c..49dac781 100644 --- a/streams_map_outgoing_generic_test.go +++ b/streams_map_outgoing_generic_test.go @@ -74,7 +74,7 @@ var _ = Describe("Streams Map (outgoing)", func() { It("errors when deleting a non-existing stream", func() { err := m.DeleteStream(1337) Expect(err).To(HaveOccurred()) - Expect(err.(streamError).TestError()).To(MatchError("Tried to delete unknown stream 1337")) + Expect(err.(streamError).TestError()).To(MatchError("Tried to delete unknown outgoing stream 1337")) }) It("errors when deleting a stream twice", func() { @@ -83,7 +83,7 @@ var _ = Describe("Streams Map (outgoing)", func() { Expect(m.DeleteStream(1)).To(Succeed()) err = m.DeleteStream(1) Expect(err).To(HaveOccurred()) - Expect(err.(streamError).TestError()).To(MatchError("Tried to delete unknown stream 1")) + Expect(err.(streamError).TestError()).To(MatchError("Tried to delete unknown outgoing stream 1")) }) It("closes all streams when CloseWithError is called", func() { diff --git a/streams_map_outgoing_uni.go b/streams_map_outgoing_uni.go index c020fa1c..8f4cf281 100644 --- a/streams_map_outgoing_uni.go +++ b/streams_map_outgoing_uni.go @@ -155,7 +155,7 @@ func (m *outgoingUniStreamsMap) DeleteStream(num protocol.StreamNum) error { if _, ok := m.streams[num]; !ok { return streamError{ - message: "Tried to delete unknown stream %d", + message: "Tried to delete unknown outgoing stream %d", nums: []protocol.StreamNum{num}, } } diff --git a/streams_map_test.go b/streams_map_test.go index 701cb63e..9a468200 100644 --- a/streams_map_test.go +++ b/streams_map_test.go @@ -212,22 +212,22 @@ var _ = Describe("Streams Map", func() { It("errors when deleting unknown incoming unidirectional streams", func() { id := ids.firstIncomingUniStream + 4 - Expect(m.DeleteStream(id)).To(MatchError(fmt.Sprintf("Tried to delete unknown stream %d", id))) + Expect(m.DeleteStream(id)).To(MatchError(fmt.Sprintf("Tried to delete unknown incoming stream %d", id))) }) It("errors when deleting unknown outgoing unidirectional streams", func() { id := ids.firstOutgoingUniStream + 4 - Expect(m.DeleteStream(id)).To(MatchError(fmt.Sprintf("Tried to delete unknown stream %d", id))) + Expect(m.DeleteStream(id)).To(MatchError(fmt.Sprintf("Tried to delete unknown outgoing stream %d", id))) }) It("errors when deleting unknown incoming bidirectional streams", func() { id := ids.firstIncomingBidiStream + 4 - Expect(m.DeleteStream(id)).To(MatchError(fmt.Sprintf("Tried to delete unknown stream %d", id))) + Expect(m.DeleteStream(id)).To(MatchError(fmt.Sprintf("Tried to delete unknown incoming stream %d", id))) }) It("errors when deleting unknown outgoing bidirectional streams", func() { id := ids.firstOutgoingBidiStream + 4 - Expect(m.DeleteStream(id)).To(MatchError(fmt.Sprintf("Tried to delete unknown stream %d", id))) + Expect(m.DeleteStream(id)).To(MatchError(fmt.Sprintf("Tried to delete unknown outgoing stream %d", id))) }) })