From a001a89f13ddb19f693dc5b0b1bf4eb3b2f579b7 Mon Sep 17 00:00:00 2001 From: Michael Li Date: Thu, 18 Apr 2024 18:08:29 +0000 Subject: [PATCH] backport of commit eba39ef0a038f97303343d70c33af8b2979a506b --- .../internal/e2e/tests/base_plus/rate_limit_test.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/testing/internal/e2e/tests/base_plus/rate_limit_test.go b/testing/internal/e2e/tests/base_plus/rate_limit_test.go index 4015b19437..8bdd7e8c5f 100644 --- a/testing/internal/e2e/tests/base_plus/rate_limit_test.go +++ b/testing/internal/e2e/tests/base_plus/rate_limit_test.go @@ -204,19 +204,26 @@ func TestHttpRateLimit(t *testing.T) { req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", tokenAdmin)) res, err = http.DefaultClient.Do(req) require.NoError(t, err) + t.Cleanup(func() { + res.Body.Close() + }) require.Equal(t, http.StatusOK, res.StatusCode) rateLimitHeader = res.Header.Get("Ratelimit") require.NotEmpty(t, rateLimitHeader) t.Log(rateLimitHeader) quota, err = getRateLimitStat(rateLimitHeader, "remaining") require.NoError(t, err) + for quota > 0 { requestURL = fmt.Sprintf("%s/v1/hosts/%s", bc.Address, hostId) - req, err = http.NewRequest(http.MethodGet, requestURL, nil) + req, err := http.NewRequest(http.MethodGet, requestURL, nil) require.NoError(t, err) req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", tokenAdmin)) - res, err = http.DefaultClient.Do(req) + res, err := http.DefaultClient.Do(req) require.NoError(t, err) + t.Cleanup(func() { + res.Body.Close() + }) require.Equal(t, http.StatusOK, res.StatusCode) rateLimitHeader := res.Header.Get("Ratelimit")