11package dispatch_test
22
33import (
4+ "context"
45"encoding/json"
56"fmt"
67"net/http"
@@ -41,10 +42,10 @@ func TestWebhook(t *testing.T) {
4142}
4243
4344tests := []struct {
44- name string
45- serverURL string
46- serverTimeout time.Duration
47- serverFn func (uuid.UUID , http.ResponseWriter ,* http.Request )
45+ name string
46+ serverURL string
47+ serverDeadline time.Time
48+ serverFn func (uuid.UUID , http.ResponseWriter ,* http.Request )
4849
4950expectSuccess bool
5051expectRetryable bool
@@ -76,10 +77,13 @@ func TestWebhook(t *testing.T) {
7677},
7778{
7879name :"timeout" ,
79- serverTimeout :time .Nanosecond ,
80+ serverDeadline :time .Now (). Add ( - time . Hour ) ,
8081expectSuccess :false ,
8182expectRetryable :true ,
82- expectErr :"request timeout" ,
83+ serverFn :func (u uuid.UUID ,writer http.ResponseWriter ,request * http.Request ) {
84+ t .Fatalf ("should not get here" )
85+ },
86+ expectErr :"request timeout" ,
8387},
8488{
8589name :"non-200 response" ,
@@ -99,14 +103,20 @@ func TestWebhook(t *testing.T) {
99103t .Run (tc .name ,func (t * testing.T ) {
100104t .Parallel ()
101105
102- timeout := testutil .WaitLong
103- if tc .serverTimeout > 0 {
104- timeout = tc .serverTimeout
106+ var (
107+ ctx context.Context
108+ cancel context.CancelFunc
109+ )
110+
111+ if ! tc .serverDeadline .IsZero () {
112+ ctx ,cancel = context .WithDeadline (context .Background (),tc .serverDeadline )
113+ }else {
114+ ctx ,cancel = context .WithTimeout (context .Background (),testutil .WaitLong )
105115}
116+ t .Cleanup (cancel )
106117
107118var (
108119err error
109- ctx = testutil .Context (t ,timeout )
110120msgID = uuid .New ()
111121)
112122