synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-06 15:41:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: use new context after t.Parallel in TestOAuthAppSecrets

Browse Source 
c.f. https://coder.com/blog/go-testing-contexts-and-t-parallel

fixes flakes like https://github.com/coder/coder/runs/20856469613
This commit is contained in:
Spike Curtis
2024-01-27 08:45:43 +04:00
committed by GitHub
parent de6d4794dc
commit 4825b7ccd2
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
enterprise/coderd/oauth2_test.go
View File

@ -271,18 +271,18 @@ func TestOAuthAppSecrets(t *testing.T) {
}, },
}}) }})
ctx := testutil.Context(t, testutil.WaitLong) topCtx := testutil.Context(t, testutil.WaitLong)
// Make some apps. // Make some apps.
//nolint:gocritic // OAauth2 app management requires owner permission. //nolint:gocritic // OAauth2 app management requires owner permission.
app1, err := client.PostOAuth2ProviderApp(ctx, codersdk.PostOAuth2ProviderAppRequest{ app1, err := client.PostOAuth2ProviderApp(topCtx, codersdk.PostOAuth2ProviderAppRequest{
Name: "razzle-dazzle", Name: "razzle-dazzle",
CallbackURL: "http://localhost", CallbackURL: "http://localhost",
}) })
require.NoError(t, err) require.NoError(t, err)
//nolint:gocritic // OAauth2 app management requires owner permission. //nolint:gocritic // OAauth2 app management requires owner permission.
app2, err := client.PostOAuth2ProviderApp(ctx, codersdk.PostOAuth2ProviderAppRequest{ app2, err := client.PostOAuth2ProviderApp(topCtx, codersdk.PostOAuth2ProviderAppRequest{
Name: "razzle-dazzle-the-sequel", Name: "razzle-dazzle-the-sequel",
CallbackURL: "http://localhost", CallbackURL: "http://localhost",
}) })
@ -290,6 +290,7 @@ func TestOAuthAppSecrets(t *testing.T) {
t.Run("DeleteNonExisting", func(t *testing.T) { t.Run("DeleteNonExisting", func(t *testing.T) {
t.Parallel() t.Parallel()
ctx := testutil.Context(t, testutil.WaitLong)
// Should not be able to create secrets for a non-existent app. // Should not be able to create secrets for a non-existent app.
//nolint:gocritic // OAauth2 app management requires owner permission. //nolint:gocritic // OAauth2 app management requires owner permission.
@ -318,6 +319,7 @@ func TestOAuthAppSecrets(t *testing.T) {
t.Run("OK", func(t *testing.T) { t.Run("OK", func(t *testing.T) {
t.Parallel() t.Parallel()
ctx := testutil.Context(t, testutil.WaitLong)
// No secrets yet. // No secrets yet.
//nolint:gocritic // OAauth2 app management requires owner permission. //nolint:gocritic // OAauth2 app management requires owner permission.