metrics/librato: ensure resp.body closed (#26969)
This change ensures that we call Close on a http response body, in various places in the source code (mostly tests)
This commit is contained in:
parent
41f89ca944
commit
117530b0e6
@ -156,6 +156,7 @@ func TestGraphQLBlockSerialization(t *testing.T) {
|
|||||||
t.Fatalf("could not post: %v", err)
|
t.Fatalf("could not post: %v", err)
|
||||||
}
|
}
|
||||||
bodyBytes, err := io.ReadAll(resp.Body)
|
bodyBytes, err := io.ReadAll(resp.Body)
|
||||||
|
resp.Body.Close()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("could not read from response body: %v", err)
|
t.Fatalf("could not read from response body: %v", err)
|
||||||
}
|
}
|
||||||
@ -239,6 +240,7 @@ func TestGraphQLBlockSerializationEIP2718(t *testing.T) {
|
|||||||
t.Fatalf("could not post: %v", err)
|
t.Fatalf("could not post: %v", err)
|
||||||
}
|
}
|
||||||
bodyBytes, err := io.ReadAll(resp.Body)
|
bodyBytes, err := io.ReadAll(resp.Body)
|
||||||
|
resp.Body.Close()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("could not read from response body: %v", err)
|
t.Fatalf("could not read from response body: %v", err)
|
||||||
}
|
}
|
||||||
@ -263,6 +265,7 @@ func TestGraphQLHTTPOnSamePort_GQLRequest_Unsuccessful(t *testing.T) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("could not post: %v", err)
|
t.Fatalf("could not post: %v", err)
|
||||||
}
|
}
|
||||||
|
resp.Body.Close()
|
||||||
// make sure the request is not handled successfully
|
// make sure the request is not handled successfully
|
||||||
assert.Equal(t, http.StatusNotFound, resp.StatusCode)
|
assert.Equal(t, http.StatusNotFound, resp.StatusCode)
|
||||||
}
|
}
|
||||||
|
@ -87,9 +87,11 @@ func (c *LibratoClient) PostMetrics(batch Batch) (err error) {
|
|||||||
req.Header.Set("Content-Type", "application/json")
|
req.Header.Set("Content-Type", "application/json")
|
||||||
req.SetBasicAuth(c.Email, c.Token)
|
req.SetBasicAuth(c.Email, c.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
|
||||||
|
@ -615,6 +615,7 @@ func doHTTPRequest(t *testing.T, req *http.Request) *http.Response {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("could not issue a GET request to the given endpoint: %v", err)
|
t.Fatalf("could not issue a GET request to the given endpoint: %v", err)
|
||||||
}
|
}
|
||||||
|
t.Cleanup(func() { resp.Body.Close() })
|
||||||
return resp
|
return resp
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -320,6 +320,7 @@ func baseRpcRequest(t *testing.T, url, bodyStr string, extraHeaders ...string) *
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
t.Cleanup(func() { resp.Body.Close() })
|
||||||
return resp
|
return resp
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -428,9 +428,11 @@ func execP2PNode() {
|
|||||||
|
|
||||||
// Send status to the host.
|
// Send status to the host.
|
||||||
statusJSON, _ := json.Marshal(status)
|
statusJSON, _ := json.Marshal(status)
|
||||||
if _, err := http.Post(statusURL, "application/json", bytes.NewReader(statusJSON)); err != nil {
|
resp, err := http.Post(statusURL, "application/json", bytes.NewReader(statusJSON))
|
||||||
|
if err != nil {
|
||||||
log.Crit("Can't post startup info", "url", statusURL, "err", err)
|
log.Crit("Can't post startup info", "url", statusURL, "err", err)
|
||||||
}
|
}
|
||||||
|
resp.Body.Close()
|
||||||
if stackErr != nil {
|
if stackErr != nil {
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
|
@ -124,6 +124,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)
|
||||||
}
|
}
|
||||||
@ -145,15 +146,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
|
||||||
nodesInfo, err = client.GetNodes()
|
nodesInfo, err = client.GetNodes()
|
||||||
|
@ -94,6 +94,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)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user