From 25c6f58535ea568943dd0c31e24694a2146207ab Mon Sep 17 00:00:00 2001 From: James Hillyerd Date: Mon, 19 Feb 2024 12:02:06 -0800 Subject: [PATCH] chore: fix testutils linter warnings (#502) Signed-off-by: James Hillyerd --- pkg/rest/testutils_test.go | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkg/rest/testutils_test.go b/pkg/rest/testutils_test.go index acd8913..c534193 100644 --- a/pkg/rest/testutils_test.go +++ b/pkg/rest/testutils_test.go @@ -2,12 +2,14 @@ package rest import ( "bytes" + "context" "log" "net/http" "net/http/httptest" "strconv" "strings" "testing" + "time" "github.com/inbucket/inbucket/v3/pkg/config" "github.com/inbucket/inbucket/v3/pkg/message" @@ -16,24 +18,36 @@ import ( ) func testRestGet(url string) (*httptest.ResponseRecorder, error) { - req, err := http.NewRequest("GET", url, nil) + ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) + defer cancel() + + req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil) req.Header.Add("Accept", "application/json") if err != nil { return nil, err } + + // Pass request to handlers directly. w := httptest.NewRecorder() web.Router.ServeHTTP(w, req) + return w, nil } func testRestPatch(url string, body string) (*httptest.ResponseRecorder, error) { - req, err := http.NewRequest("PATCH", url, strings.NewReader(body)) + ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) + defer cancel() + + req, err := http.NewRequestWithContext(ctx, http.MethodPatch, url, strings.NewReader(body)) req.Header.Add("Accept", "application/json") if err != nil { return nil, err } + + // Pass request to handlers directly. w := httptest.NewRecorder() web.Router.ServeHTTP(w, req) + return w, nil }