Commitee0ee70

committed

Fix context cancel for HTTP requests

1 parent1a48bea commitee0ee70Copy full SHA for ee0ee70

File tree

-1

lines changed

-1

lines changed

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import (`
`4`	`4`	`"context"`
`5`	`5`	`"database/sql"`
`6`	`6`	`"io"`
	`7`	`+"net"`
`7`	`8`	`"net/http/httptest"`
`8`	`9`	`"net/url"`
`9`	`10`	`"os"`
`@@ -59,7 +60,13 @@ func New(t testing.T) codersdk.Client {`
`59`	`60`	`Database:db,`
`60`	`61`	`Pubsub:pubsub,`
`61`	`62`	`})`
`62`		`-srv:=httptest.NewServer(handler)`
	`63`	`+srv:=httptest.NewUnstartedServer(handler)`
	`64`	`+srv.Config.BaseContext=func(_ net.Listener) context.Context {`
	`65`	`+ctx,cancelFunc:=context.WithCancel(context.Background())`
	`66`	`+t.Cleanup(cancelFunc)`
	`67`	`+returnctx`
	`68`	`+}`
	`69`	`+srv.Start()`
`63`	`70`	`serverURL,err:=url.Parse(srv.URL)`
`64`	`71`	`require.NoError(t,err)`
`65`	`72`	`t.Cleanup(srv.Close)`

Comments

(0)