all: ensure resp.body closed (#26969)

This commit is contained in:
Daniel Liu 2024-12-13 14:00:13 +08:00
parent 6e055a601d
commit 54570300cc
4 changed files with 9 additions and 2 deletions

View file

@ -87,9 +87,11 @@ func (lc *LibratoClient) PostMetrics(batch Batch) (err error) {
req.Header.Set("Content-Type", "application/json") req.Header.Set("Content-Type", "application/json")
req.SetBasicAuth(lc.Email, lc.Token) req.SetBasicAuth(lc.Email, lc.Token)
if resp, err = http.DefaultClient.Do(req); err != nil { resp, err = http.DefaultClient.Do(req)
if err != nil {
return return
} }
defer resp.Body.Close()
if resp.StatusCode != http.StatusOK { if resp.StatusCode != http.StatusOK {
var body []byte var body []byte

View file

@ -651,5 +651,6 @@ func doHTTPRequest(t *testing.T, req *http.Request) *http.Response {
if err != nil { if err != nil {
t.Error("could not issue a GET request to the given endpoint", err) t.Error("could not issue a GET request to the given endpoint", err)
} }
t.Cleanup(func() { resp.Body.Close() })
return resp return resp
} }

View file

@ -127,6 +127,7 @@ func TestMocker(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("Could not start mocker: %s", err) t.Fatalf("Could not start mocker: %s", err)
} }
resp.Body.Close()
if resp.StatusCode != 200 { if resp.StatusCode != 200 {
t.Fatalf("Invalid Status Code received for starting mocker, expected 200, got %d", resp.StatusCode) t.Fatalf("Invalid Status Code received for starting mocker, expected 200, got %d", resp.StatusCode)
} }
@ -148,15 +149,17 @@ func TestMocker(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("Could not stop mocker: %s", err) t.Fatalf("Could not stop mocker: %s", err)
} }
resp.Body.Close()
if resp.StatusCode != 200 { if resp.StatusCode != 200 {
t.Fatalf("Invalid Status Code received for stopping mocker, expected 200, got %d", resp.StatusCode) t.Fatalf("Invalid Status Code received for stopping mocker, expected 200, got %d", resp.StatusCode)
} }
//reset the network //reset the network
_, err = http.Post(s.URL+"/reset", "", nil) resp, err = http.Post(s.URL+"/reset", "", nil)
if err != nil { if err != nil {
t.Fatalf("Could not reset network: %s", err) t.Fatalf("Could not reset network: %s", err)
} }
resp.Body.Close()
//now the number of nodes in the network should be zero //now the number of nodes in the network should be zero
nodes_info, err = client.GetNodes() nodes_info, err = client.GetNodes()

View file

@ -92,6 +92,7 @@ func confirmHTTPRequestYieldsStatusCode(t *testing.T, method, contentType, body
if err != nil { if err != nil {
t.Fatalf("request failed: %v", err) t.Fatalf("request failed: %v", err)
} }
resp.Body.Close()
confirmStatusCode(t, resp.StatusCode, expectedStatusCode) confirmStatusCode(t, resp.StatusCode, expectedStatusCode)
} }