mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-03 20:27:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

return StreamErrors for all kinds of stream cancelations (#3681)

Browse source 
* fix: return typed errors when after cancelling actions

This is errors.Is'ed by libp2p and the fmt.Errorf messages didn't passed that test:
82315917f7/p2p/transport/quic/stream.go (L23)

* replace StreamErrorAction with a local / remote flag

Co-authored-by: Jorropo <jorropo.pgm@gmail.com>
This commit is contained in:
Marten Seemann 2023-01-26 12:58:06 -08:00 • committed by GitHub
parent dfbfe71309
commit 3f9d8feab2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 69 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

28
send_stream_test.go
View file

@ -726,7 +726,11 @@ var _ = Describe("Send Stream", func() {
defer GinkgoRecover()
var err error
n, err = strWithTimeout.Write(getData(5000))
Expect(err).To(MatchError("Write on stream 1337 canceled with error code 1234"))
Expect(err).To(Equal(&StreamError{
StreamID: streamID,
ErrorCode: 1234,
Remote: false,
}))
close(writeReturned)
}()
waitForWrite()
@ -770,7 +774,11 @@ var _ = Describe("Send Stream", func() {
go func() {
defer GinkgoRecover()
_, err := strWithTimeout.Write(getData(5000))
Expect(err).To(MatchError("Write on stream 1337 canceled with error code 1234"))
Expect(err).To(Equal(&StreamError{
StreamID: streamID,
ErrorCode: 1234,
Remote: false,
}))
close(writeReturned)
}()
waitForWrite()
@ -818,7 +826,11 @@ var _ = Describe("Send Stream", func() {
mockSender.EXPECT().onStreamCompleted(gomock.Any())
str.CancelWrite(1234)
_, err := strWithTimeout.Write([]byte("foobar"))
Expect(err).To(MatchError("Write on stream 1337 canceled with error code 1234"))
Expect(err).To(MatchError(&StreamError{
StreamID: streamID,
ErrorCode: 1234,
Remote: false,
}))
})
It("only cancels once", func() {
@ -862,9 +874,10 @@ var _ = Describe("Send Stream", func() {
go func() {
defer GinkgoRecover()
_, err := str.Write(getData(5000))
Expect(err).To(MatchError(&StreamError{
Expect(err).To(Equal(&StreamError{
StreamID: streamID,
ErrorCode: 1234,
ErrorCode: 123,
Remote: true,
}))
close(done)
}()
@ -884,9 +897,10 @@ var _ = Describe("Send Stream", func() {
ErrorCode: 123,
})
_, err := str.Write([]byte("foobar"))
Expect(err).To(MatchError(&StreamError{
Expect(err).To(Equal(&StreamError{
StreamID: streamID,
ErrorCode: 1234,
ErrorCode: 123,
Remote: true,
}))
})
})