Skip to content

fix: use negative deadline to ensure timeout in TestWebhook/timeout #14498

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
merged 2 commits into from
Aug 30, 2024
Merged

fix: use negative deadline to ensure timeout in TestWebhook/timeout #14498

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a76b7fb
WIP
dannykopping Aug 30, 2024
2571b86
make fmt
dannykopping Aug 30, 2024
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
30 changes: 20 additions & 10 deletions coderd/notifications/dispatch/webhook_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package dispatch_test

import (
"context"
"encoding/json"
"fmt"
"net/http"
Expand Down Expand Up @@ -41,10 +42,10 @@ func TestWebhook(t *testing.T) {
}

tests := []struct {
name string
serverURL string
serverTimeout time.Duration
serverFn func(uuid.UUID, http.ResponseWriter, *http.Request)
name string
serverURL string
serverDeadline time.Time
serverFn func(uuid.UUID, http.ResponseWriter, *http.Request)

expectSuccess bool
expectRetryable bool
Expand Down Expand Up @@ -76,10 +77,13 @@ func TestWebhook(t *testing.T) {
},
{
name: "timeout",
serverTimeout: time.Nanosecond,
serverDeadline: time.Now().Add(-time.Hour),
expectSuccess: false,
expectRetryable: true,
expectErr: "request timeout",
serverFn: func(u uuid.UUID, writer http.ResponseWriter, request *http.Request) {
t.Fatalf("should not get here")
},
expectErr: "request timeout",
},
{
name: "non-200 response",
Expand All @@ -99,14 +103,20 @@ func TestWebhook(t *testing.T) {
t.Run(tc.name, func(t *testing.T) {
t.Parallel()

timeout := testutil.WaitLong
if tc.serverTimeout > 0 {
timeout = tc.serverTimeout
var (
ctx context.Context
cancel context.CancelFunc
)

if !tc.serverDeadline.IsZero() {
ctx, cancel = context.WithDeadline(context.Background(), tc.serverDeadline)
} else {
ctx, cancel = context.WithTimeout(context.Background(), testutil.WaitLong)
}
t.Cleanup(cancel)

var (
err error
ctx = testutil.Context(t, timeout)
msgID = uuid.New()
)

Expand Down
Loading