Skip to content

test(discord): fix tail failure synchronization #140

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

Merged
steipete merged 2 commits into from
Jul 18, 2026
+16 −12
Merged

test(discord): fix tail failure synchronization #140

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
851579f
test(discord): fix tail failure synchronization
steipete Jul 18, 2026
2ae98a5
test(discord): separate tail test deadlines
steipete Jul 18, 2026
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
28 changes: 16 additions & 12 deletions internal/discord/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2547,12 +2547,14 @@ func TestTailMessageUpdateFailureUsesRefetchedMetadata(t *testing.T) {

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()
testCtx, cancelTest := context.WithTimeout(context.Background(), 5*time.Second)
defer cancelTest()
tailCtx, cancelTail := context.WithCancel(testCtx)
defer cancelTail()

handler := &messageUpdateFailureHandler{
fail: tt.fail,
cancel: cancel,
cancel: cancelTail,
failureReported: make(chan struct{}),
failures: make(chan TailFailure, 1),
recorded: make(chan TailFailure, 1),
Expand All @@ -2578,7 +2580,7 @@ func TestTailMessageUpdateFailureUsesRefetchedMetadata(t *testing.T) {
}
select {
case <-handler.failureReported:
case <-ctx.Done():
case <-testCtx.Done():
t.Error("tail failure was not reported")
}
},
Expand All @@ -2596,8 +2598,8 @@ func TestTailMessageUpdateFailureUsesRefetchedMetadata(t *testing.T) {
client.tailQueueSize = 1
client.tailHandlerTimeout = 25 * time.Millisecond

require.NoError(t, client.Tail(ctx, handler))
require.ErrorIs(t, ctx.Err(), context.Canceled)
require.NoError(t, client.Tail(tailCtx, handler))
require.ErrorIs(t, tailCtx.Err(), context.Canceled)
update := <-handler.updates
require.Equal(t, "g-refetched", update.GuildID)
require.Equal(t, "u-refetched", update.Author.ID)
Expand Down Expand Up @@ -2876,14 +2878,16 @@ func TestTailMessageUpdateRejectsConflictingRefetchIdentity(t *testing.T) {

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()
testCtx, cancelTest := context.WithTimeout(context.Background(), 5*time.Second)
defer cancelTest()
tailCtx, cancelTail := context.WithCancel(testCtx)
defer cancelTail()

handler := &messageUpdateFailureHandler{
fail: func(context.Context) error {
return nil
},
cancel: cancel,
cancel: cancelTail,
failureReported: make(chan struct{}),
failures: make(chan TailFailure, 1),
recorded: make(chan TailFailure, 1),
Expand All @@ -2908,7 +2912,7 @@ func TestTailMessageUpdateRejectsConflictingRefetchIdentity(t *testing.T) {
}
select {
case <-handler.failureReported:
case <-ctx.Done():
case <-testCtx.Done():
t.Error("tail failure was not reported")
}
},
Expand All @@ -2925,8 +2929,8 @@ func TestTailMessageUpdateRejectsConflictingRefetchIdentity(t *testing.T) {
client.tailWorkerCount = 1
client.tailQueueSize = 1

require.NoError(t, client.Tail(ctx, handler))
require.ErrorIs(t, ctx.Err(), context.Canceled)
require.NoError(t, client.Tail(tailCtx, handler))
require.ErrorIs(t, tailCtx.Err(), context.Canceled)
update := <-handler.updates
require.Equal(t, "m1", update.ID)
require.Equal(t, "g1", update.GuildID)
Expand Down