selfhosted
/
coder
mirror of https://github.com/coder/coder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore: improve times of ratelimit tests (#6346) 

From 5s to 130ms!
This commit is contained in:
Kyle Carberry 2023-02-25 16:01:01 -06:00 committed by GitHub
parent acf000aaa5
commit 17adfd1134
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
coderd/coderdtest/coderdtest.go
View File

@ -484,6 +484,9 @@ func createAnotherUserRetry(t *testing.T, client *codersdk.Client, organizationI
other := codersdk.New(client.URL)
other.SetSessionToken(login.SessionToken)
t.Cleanup(func() {
other.HTTPClient.CloseIdleConnections()
})
if len(roles) > 0 {
// Find the roles for the org vs the site wide roles

42
coderd/httpmw/ratelimit_test.go
View File

@ -18,7 +18,6 @@ import (
"github.com/coder/coder/coderd/httpmw"
"github.com/coder/coder/coderd/rbac"
"github.com/coder/coder/codersdk"
"github.com/coder/coder/testutil"
)
func randRemoteAddr() string {
@ -34,38 +33,39 @@ func TestRateLimit(t *testing.T) {
t.Run("NoUserSucceeds", func(t *testing.T) {
t.Parallel()
rtr := chi.NewRouter()
rtr.Use(httpmw.RateLimit(5, time.Second))
rtr.Use(httpmw.RateLimit(1, time.Second))
rtr.Get("/", func(rw http.ResponseWriter, r *http.Request) {
rw.WriteHeader(http.StatusOK)
})
require.Eventually(t, func() bool {
for i := 0; i < 5; i++ {
req := httptest.NewRequest("GET", "/", nil)
rec := httptest.NewRecorder()
rtr.ServeHTTP(rec, req)
resp := rec.Result()
defer resp.Body.Close()
return resp.StatusCode == http.StatusTooManyRequests
}, testutil.WaitShort, testutil.IntervalFast)
_ = resp.Body.Close()
require.Equal(t, i != 0, resp.StatusCode == http.StatusTooManyRequests)
}
})
t.Run("RandomIPs", func(t *testing.T) {
t.Parallel()
rtr := chi.NewRouter()
rtr.Use(httpmw.RateLimit(5, time.Second))
// Because these are random IPs, the limit should never be hit!
rtr.Use(httpmw.RateLimit(1, time.Second))
rtr.Get("/", func(rw http.ResponseWriter, r *http.Request) {
rw.WriteHeader(http.StatusOK)
})
require.Never(t, func() bool {
for i := 0; i < 5; i++ {
req := httptest.NewRequest("GET", "/", nil)
rec := httptest.NewRecorder()
req.RemoteAddr = randRemoteAddr()
rtr.ServeHTTP(rec, req)
resp := rec.Result()
defer resp.Body.Close()
return resp.StatusCode == http.StatusTooManyRequests
}, testutil.WaitShort, testutil.IntervalFast)
_ = resp.Body.Close()
require.False(t, resp.StatusCode == http.StatusTooManyRequests)
}
})
t.Run("RegularUser", func(t *testing.T) {
@ -81,7 +81,7 @@ func TestRateLimit(t *testing.T) {
Optional: false,
}))
rtr.Use(httpmw.RateLimit(5, time.Second))
rtr.Use(httpmw.RateLimit(1, time.Second))
rtr.Get("/", func(rw http.ResponseWriter, r *http.Request) {
rw.WriteHeader(http.StatusOK)
})
@ -98,7 +98,7 @@ func TestRateLimit(t *testing.T) {
defer resp.Body.Close()
require.Equal(t, http.StatusPreconditionRequired, resp.StatusCode)
require.Eventually(t, func() bool {
for i := 0; i < 5; i++ {
req := httptest.NewRequest("GET", "/", nil)
req.Header.Set(codersdk.SessionTokenHeader, key)
rec := httptest.NewRecorder()
@ -106,9 +106,9 @@ func TestRateLimit(t *testing.T) {
req.RemoteAddr = randRemoteAddr()
rtr.ServeHTTP(rec, req)
resp := rec.Result()
defer resp.Body.Close()
return resp.StatusCode == http.StatusTooManyRequests
}, testutil.WaitShort, testutil.IntervalFast)
_ = resp.Body.Close()
require.Equal(t, i != 0, resp.StatusCode == http.StatusTooManyRequests)
}
})
t.Run("OwnerBypass", func(t *testing.T) {
@ -127,12 +127,12 @@ func TestRateLimit(t *testing.T) {
Optional: false,
}))
rtr.Use(httpmw.RateLimit(5, time.Second))
rtr.Use(httpmw.RateLimit(1, time.Second))
rtr.Get("/", func(rw http.ResponseWriter, r *http.Request) {
rw.WriteHeader(http.StatusOK)
})
require.Never(t, func() bool {
for i := 0; i < 5; i++ {
req := httptest.NewRequest("GET", "/", nil)
req.Header.Set(codersdk.SessionTokenHeader, key)
req.Header.Set(codersdk.BypassRatelimitHeader, "true")
@ -141,8 +141,8 @@ func TestRateLimit(t *testing.T) {
req.RemoteAddr = randRemoteAddr()
rtr.ServeHTTP(rec, req)
resp := rec.Result()
defer resp.Body.Close()
return resp.StatusCode == http.StatusTooManyRequests
}, testutil.WaitShort, testutil.IntervalFast)
_ = resp.Body.Close()
require.False(t, resp.StatusCode == http.StatusTooManyRequests)
}
})
}

3
provisioner/terraform/install_test.go
View File

@ -18,6 +18,9 @@ import (
func TestInstall(t *testing.T) {
t.Parallel()
if testing.Short() {
t.SkipNow()
}
ctx := context.Background()
dir := t.TempDir()
log := slogtest.Make(t, nil)