Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SendContext fix #300

Merged
merged 2 commits into from
Mar 24, 2021
Merged

SendContext fix #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d22820a
SendContext didn't check if context is done first. Instead, in case c…
pashaosipyants Mar 23, 2021
d4af109
Update item.go
pashaosipyants Mar 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions item.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,15 @@ func (i Item) SendBlocking(ch chan<- Item) {
// It returns a boolean to indicate whether the item was sent.
func (i Item) SendContext(ctx context.Context, ch chan<- Item) bool {
select {
case <-ctx.Done():
case <-ctx.Done(): // Context's done channel has the highest priority
return false
case ch <- i:
return true
default:
select {
case <-ctx.Done():
return false
case ch <- i:
return true
}
}
}

Expand Down
9 changes: 9 additions & 0 deletions item_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,15 @@ func Test_Item_SendContext_True(t *testing.T) {
assert.True(t, Of(5).SendContext(ctx, ch))
}

func Test_Item_SendContext_False(t *testing.T) {
defer goleak.VerifyNone(t)
ch := make(chan Item, 1)
defer close(ch)
ctx, cancel := context.WithCancel(context.Background())
cancel()
assert.False(t, Of(5).SendContext(ctx, ch))
}

func Test_Item_SendNonBlocking(t *testing.T) {
defer goleak.VerifyNone(t)
ch := make(chan Item, 1)
Expand Down