Skip to content

Commit eccb82b

Browse files
committed
test(coderd): avoid shared user skill test contexts
1 parent 4058701 commit eccb82b

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

coderd/userskills_test.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -439,9 +439,6 @@ func TestUserSkillDatabaseConstraints(t *testing.T) {
439439
adminClient, _, api := coderdtest.NewWithAPI(t, nil)
440440
firstUser := coderdtest.CreateFirstUser(t, adminClient)
441441
_, ownerUser := coderdtest.CreateAnotherUser(t, adminClient, firstUser.OrganizationID)
442-
ctx := testutil.Context(t, testutil.WaitMedium)
443-
authzCtx := dbauthz.As(ctx, coderdtest.AuthzUserSubject(ownerUser))
444-
445442
tests := []struct {
446443
name string
447444
params database.InsertUserSkillParams
@@ -482,6 +479,9 @@ func TestUserSkillDatabaseConstraints(t *testing.T) {
482479
t.Run(tt.name, func(t *testing.T) {
483480
t.Parallel()
484481

482+
ctx := testutil.Context(t, testutil.WaitMedium)
483+
authzCtx := dbauthz.As(ctx, coderdtest.AuthzUserSubject(ownerUser))
484+
485485
_, err := api.Database.InsertUserSkill(authzCtx, tt.params)
486486
require.True(t, database.IsCheckViolation(err, tt.constraint), "expected %s, got %v", tt.constraint, err)
487487
})
@@ -492,8 +492,8 @@ func TestUserSkillSchemaConstants(t *testing.T) {
492492
t.Parallel()
493493

494494
_, _, sqlDB := dbtestutil.NewDBWithSQLDB(t)
495-
ctx := testutil.Context(t, testutil.WaitMedium)
496495

496+
ctx := testutil.Context(t, testutil.WaitMedium)
497497
var triggerDef string
498498
require.NoError(t, sqlDB.QueryRowContext(
499499
ctx,
@@ -510,6 +510,7 @@ func TestUserSkillSchemaConstants(t *testing.T) {
510510
t.Run(string(constraint), func(t *testing.T) {
511511
t.Parallel()
512512

513+
ctx := testutil.Context(t, testutil.WaitMedium)
513514
var constraintDef string
514515
require.NoError(t, sqlDB.QueryRowContext(
515516
ctx,

0 commit comments

Comments
 (0)