Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb65e133

Browse files
authored
chore(enterprise/coderd): remove dbmem from tests (#18797)
Related to#15109.
1 parent0dc3612 commitb65e133

File tree

5 files changed

+56
-43
lines changed

5 files changed

+56
-43
lines changed

‎enterprise/coderd/coderd_test.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ import (
4242
"github.com/coder/coder/v2/coderd/database"
4343
"github.com/coder/coder/v2/coderd/database/dbauthz"
4444
"github.com/coder/coder/v2/coderd/database/dbfake"
45-
"github.com/coder/coder/v2/coderd/database/dbmem"
4645
"github.com/coder/coder/v2/coderd/database/dbtestutil"
4746
"github.com/coder/coder/v2/coderd/database/dbtime"
4847
"github.com/coder/coder/v2/coderd/rbac"
@@ -323,19 +322,21 @@ func TestAuditLogging(t *testing.T) {
323322
t.Parallel()
324323
t.Run("Enabled",func(t*testing.T) {
325324
t.Parallel()
325+
db,_:=dbtestutil.NewDB(t)
326326
_,_,api,_:=coderdenttest.NewWithAPI(t,&coderdenttest.Options{
327327
AuditLogging:true,
328328
Options:&coderdtest.Options{
329-
Auditor:audit.NewAuditor(dbmem.New(),audit.DefaultFilter),
329+
Auditor:audit.NewAuditor(db,audit.DefaultFilter),
330330
},
331331
LicenseOptions:&coderdenttest.LicenseOptions{
332332
Features: license.Features{
333333
codersdk.FeatureAuditLog:1,
334334
},
335335
},
336336
})
337+
db,_=dbtestutil.NewDB(t)
337338
auditor:=*api.AGPL.Auditor.Load()
338-
ea:=audit.NewAuditor(dbmem.New(),audit.DefaultFilter)
339+
ea:=audit.NewAuditor(db,audit.DefaultFilter)
339340
t.Logf("%T = %T",auditor,ea)
340341
assert.EqualValues(t,reflect.ValueOf(ea).Type(),reflect.ValueOf(auditor).Type())
341342
})

‎enterprise/coderd/dormancy/dormantusersjob_test.go

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212

1313
"github.com/coder/coder/v2/coderd/audit"
1414
"github.com/coder/coder/v2/coderd/database"
15-
"github.com/coder/coder/v2/coderd/database/dbmem"
15+
"github.com/coder/coder/v2/coderd/database/dbtestutil"
1616
"github.com/coder/coder/v2/enterprise/coderd/dormancy"
1717
"github.com/coder/quartz"
1818
)
@@ -26,7 +26,7 @@ func TestCheckInactiveUsers(t *testing.T) {
2626

2727
// Add some dormant accounts
2828
logger:=slogtest.Make(t,&slogtest.Options{IgnoreErrors:true})
29-
db:=dbmem.New()
29+
db,_:=dbtestutil.NewDB(t)
3030

3131
ctx,cancelFunc:=context.WithCancel(context.Background())
3232
t.Cleanup(cancelFunc)
@@ -75,7 +75,7 @@ func TestCheckInactiveUsers(t *testing.T) {
7575
allUsers:=ignoreUpdatedAt(database.ConvertUserRows(rows))
7676

7777
// Verify user status
78-
expectedUsers:= []database.User{
78+
expectedUsers:=ignoreUpdatedAt([]database.User{
7979
asDormant(inactiveUser1),
8080
asDormant(inactiveUser2),
8181
asDormant(inactiveUser3),
@@ -85,14 +85,24 @@ func TestCheckInactiveUsers(t *testing.T) {
8585
suspendedUser1,
8686
suspendedUser2,
8787
suspendedUser3,
88-
}
88+
})
89+
8990
require.ElementsMatch(t,allUsers,expectedUsers)
9091
}
9192

9293
funcsetupUser(ctx context.Context,t*testing.T,db database.Store,emailstring,status database.UserStatus,lastSeenAt time.Time) database.User {
9394
t.Helper()
9495

95-
user,err:=db.InsertUser(ctx, database.InsertUserParams{ID:uuid.New(),LoginType:database.LoginTypePassword,Username:uuid.NewString()[:8],Email:email})
96+
now:=dbtestutil.NowInDefaultTimezone()
97+
user,err:=db.InsertUser(ctx, database.InsertUserParams{
98+
ID:uuid.New(),
99+
LoginType:database.LoginTypePassword,
100+
Username:uuid.NewString()[:8],
101+
Email:email,
102+
RBACRoles: []string{},
103+
CreatedAt:now,
104+
UpdatedAt:now,
105+
})
96106
require.NoError(t,err)
97107
// At the beginning of the test all users are marked as active
98108
user,err=db.UpdateUserStatus(ctx, database.UpdateUserStatusParams{ID:user.ID,Status:status})

‎enterprise/coderd/enidpsync/organizations_test.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,6 @@ type OrganizationSyncTestCase struct {
5353
funcTestOrganizationSync(t*testing.T) {
5454
t.Parallel()
5555

56-
ifdbtestutil.WillUsePostgres() {
57-
t.Skip("Skipping test because it populates a lot of db entries, which is slow on postgres")
58-
}
59-
6056
requireUserOrgs:=func(t*testing.T,db database.Store,user database.User,expected []uuid.UUID) {
6157
t.Helper()
6258

‎enterprise/coderd/license/license_test.go

Lines changed: 32 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/stretchr/testify/require"
1313

1414
"github.com/coder/coder/v2/coderd/database"
15-
"github.com/coder/coder/v2/coderd/database/dbmem"
15+
"github.com/coder/coder/v2/coderd/database/dbtestutil"
1616
"github.com/coder/coder/v2/coderd/database/dbtime"
1717
"github.com/coder/coder/v2/codersdk"
1818
"github.com/coder/coder/v2/enterprise/coderd/coderdenttest"
@@ -30,7 +30,7 @@ func TestEntitlements(t *testing.T) {
3030

3131
t.Run("Defaults",func(t*testing.T) {
3232
t.Parallel()
33-
db:=dbmem.New()
33+
db,_:=dbtestutil.NewDB(t)
3434
entitlements,err:=license.Entitlements(context.Background(),db,1,1,coderdenttest.Keys,all)
3535
require.NoError(t,err)
3636
require.False(t,entitlements.HasLicense)
@@ -42,7 +42,7 @@ func TestEntitlements(t *testing.T) {
4242
})
4343
t.Run("Always return the current user count",func(t*testing.T) {
4444
t.Parallel()
45-
db:=dbmem.New()
45+
db,_:=dbtestutil.NewDB(t)
4646
entitlements,err:=license.Entitlements(context.Background(),db,1,1,coderdenttest.Keys,all)
4747
require.NoError(t,err)
4848
require.False(t,entitlements.HasLicense)
@@ -51,7 +51,7 @@ func TestEntitlements(t *testing.T) {
5151
})
5252
t.Run("SingleLicenseNothing",func(t*testing.T) {
5353
t.Parallel()
54-
db:=dbmem.New()
54+
db,_:=dbtestutil.NewDB(t)
5555
db.InsertLicense(context.Background(), database.InsertLicenseParams{
5656
JWT:coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{}),
5757
Exp:dbtime.Now().Add(time.Hour),
@@ -67,7 +67,7 @@ func TestEntitlements(t *testing.T) {
6767
})
6868
t.Run("SingleLicenseAll",func(t*testing.T) {
6969
t.Parallel()
70-
db:=dbmem.New()
70+
db,_:=dbtestutil.NewDB(t)
7171
db.InsertLicense(context.Background(), database.InsertLicenseParams{
7272
JWT:coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
7373
Features:func() license.Features {
@@ -90,7 +90,7 @@ func TestEntitlements(t *testing.T) {
9090
})
9191
t.Run("SingleLicenseGrace",func(t*testing.T) {
9292
t.Parallel()
93-
db:=dbmem.New()
93+
db,_:=dbtestutil.NewDB(t)
9494
db.InsertLicense(context.Background(), database.InsertLicenseParams{
9595
JWT:coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
9696
Features: license.Features{
@@ -116,7 +116,7 @@ func TestEntitlements(t *testing.T) {
116116
})
117117
t.Run("Expiration warning",func(t*testing.T) {
118118
t.Parallel()
119-
db:=dbmem.New()
119+
db,_:=dbtestutil.NewDB(t)
120120
db.InsertLicense(context.Background(), database.InsertLicenseParams{
121121
JWT:coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
122122
Features: license.Features{
@@ -145,7 +145,7 @@ func TestEntitlements(t *testing.T) {
145145

146146
t.Run("Expiration warning for license expiring in 1 day",func(t*testing.T) {
147147
t.Parallel()
148-
db:=dbmem.New()
148+
db,_:=dbtestutil.NewDB(t)
149149
db.InsertLicense(context.Background(), database.InsertLicenseParams{
150150
JWT:coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
151151
Features: license.Features{
@@ -174,7 +174,7 @@ func TestEntitlements(t *testing.T) {
174174

175175
t.Run("Expiration warning for trials",func(t*testing.T) {
176176
t.Parallel()
177-
db:=dbmem.New()
177+
db,_:=dbtestutil.NewDB(t)
178178
db.InsertLicense(context.Background(), database.InsertLicenseParams{
179179
JWT:coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
180180
Features: license.Features{
@@ -204,7 +204,7 @@ func TestEntitlements(t *testing.T) {
204204

205205
t.Run("Expiration warning for non trials",func(t*testing.T) {
206206
t.Parallel()
207-
db:=dbmem.New()
207+
db,_:=dbtestutil.NewDB(t)
208208
db.InsertLicense(context.Background(), database.InsertLicenseParams{
209209
JWT:coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
210210
Features: license.Features{
@@ -233,7 +233,7 @@ func TestEntitlements(t *testing.T) {
233233

234234
t.Run("SingleLicenseNotEntitled",func(t*testing.T) {
235235
t.Parallel()
236-
db:=dbmem.New()
236+
db,_:=dbtestutil.NewDB(t)
237237
db.InsertLicense(context.Background(), database.InsertLicenseParams{
238238
JWT:coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{}),
239239
Exp:time.Now().Add(time.Hour),
@@ -261,11 +261,13 @@ func TestEntitlements(t *testing.T) {
261261
})
262262
t.Run("TooManyUsers",func(t*testing.T) {
263263
t.Parallel()
264-
db:=dbmem.New()
264+
db,_:=dbtestutil.NewDB(t)
265265
activeUser1,err:=db.InsertUser(context.Background(), database.InsertUserParams{
266266
ID:uuid.New(),
267267
Username:"test1",
268+
Email:"test1@coder.com",
268269
LoginType:database.LoginTypePassword,
270+
RBACRoles: []string{},
269271
})
270272
require.NoError(t,err)
271273
_,err=db.UpdateUserStatus(context.Background(), database.UpdateUserStatusParams{
@@ -277,7 +279,9 @@ func TestEntitlements(t *testing.T) {
277279
activeUser2,err:=db.InsertUser(context.Background(), database.InsertUserParams{
278280
ID:uuid.New(),
279281
Username:"test2",
282+
Email:"test2@coder.com",
280283
LoginType:database.LoginTypePassword,
284+
RBACRoles: []string{},
281285
})
282286
require.NoError(t,err)
283287
_,err=db.UpdateUserStatus(context.Background(), database.UpdateUserStatusParams{
@@ -289,7 +293,9 @@ func TestEntitlements(t *testing.T) {
289293
_,err=db.InsertUser(context.Background(), database.InsertUserParams{
290294
ID:uuid.New(),
291295
Username:"dormant-user",
296+
Email:"dormant-user@coder.com",
292297
LoginType:database.LoginTypePassword,
298+
RBACRoles: []string{},
293299
})
294300
require.NoError(t,err)
295301
db.InsertLicense(context.Background(), database.InsertLicenseParams{
@@ -307,7 +313,7 @@ func TestEntitlements(t *testing.T) {
307313
})
308314
t.Run("MaximizeUserLimit",func(t*testing.T) {
309315
t.Parallel()
310-
db:=dbmem.New()
316+
db,_:=dbtestutil.NewDB(t)
311317
db.InsertUser(context.Background(), database.InsertUserParams{})
312318
db.InsertUser(context.Background(), database.InsertUserParams{})
313319
db.InsertLicense(context.Background(), database.InsertLicenseParams{
@@ -335,7 +341,7 @@ func TestEntitlements(t *testing.T) {
335341
})
336342
t.Run("MultipleLicenseEnabled",func(t*testing.T) {
337343
t.Parallel()
338-
db:=dbmem.New()
344+
db,_:=dbtestutil.NewDB(t)
339345
// One trial
340346
db.InsertLicense(context.Background(), database.InsertLicenseParams{
341347
Exp:time.Now().Add(time.Hour),
@@ -359,7 +365,7 @@ func TestEntitlements(t *testing.T) {
359365

360366
t.Run("Enterprise",func(t*testing.T) {
361367
t.Parallel()
362-
db:=dbmem.New()
368+
db,_:=dbtestutil.NewDB(t)
363369
_,err:=db.InsertLicense(context.Background(), database.InsertLicenseParams{
364370
Exp:time.Now().Add(time.Hour),
365371
JWT:coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
@@ -390,7 +396,7 @@ func TestEntitlements(t *testing.T) {
390396

391397
t.Run("Premium",func(t*testing.T) {
392398
t.Parallel()
393-
db:=dbmem.New()
399+
db,_:=dbtestutil.NewDB(t)
394400
_,err:=db.InsertLicense(context.Background(), database.InsertLicenseParams{
395401
Exp:time.Now().Add(time.Hour),
396402
JWT:coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
@@ -421,7 +427,7 @@ func TestEntitlements(t *testing.T) {
421427

422428
t.Run("SetNone",func(t*testing.T) {
423429
t.Parallel()
424-
db:=dbmem.New()
430+
db,_:=dbtestutil.NewDB(t)
425431
_,err:=db.InsertLicense(context.Background(), database.InsertLicenseParams{
426432
Exp:time.Now().Add(time.Hour),
427433
JWT:coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
@@ -443,7 +449,7 @@ func TestEntitlements(t *testing.T) {
443449
// AllFeatures uses the deprecated 'AllFeatures' boolean.
444450
t.Run("AllFeatures",func(t*testing.T) {
445451
t.Parallel()
446-
db:=dbmem.New()
452+
db,_:=dbtestutil.NewDB(t)
447453
db.InsertLicense(context.Background(), database.InsertLicenseParams{
448454
Exp:time.Now().Add(time.Hour),
449455
JWT:coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
@@ -473,7 +479,7 @@ func TestEntitlements(t *testing.T) {
473479

474480
t.Run("AllFeaturesAlwaysEnable",func(t*testing.T) {
475481
t.Parallel()
476-
db:=dbmem.New()
482+
db,_:=dbtestutil.NewDB(t)
477483
db.InsertLicense(context.Background(), database.InsertLicenseParams{
478484
Exp:dbtime.Now().Add(time.Hour),
479485
JWT:coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
@@ -504,7 +510,7 @@ func TestEntitlements(t *testing.T) {
504510

505511
t.Run("AllFeaturesGrace",func(t*testing.T) {
506512
t.Parallel()
507-
db:=dbmem.New()
513+
db,_:=dbtestutil.NewDB(t)
508514
db.InsertLicense(context.Background(), database.InsertLicenseParams{
509515
Exp:dbtime.Now().Add(time.Hour),
510516
JWT:coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
@@ -535,7 +541,7 @@ func TestEntitlements(t *testing.T) {
535541

536542
t.Run("MultipleReplicasNoLicense",func(t*testing.T) {
537543
t.Parallel()
538-
db:=dbmem.New()
544+
db,_:=dbtestutil.NewDB(t)
539545
entitlements,err:=license.Entitlements(context.Background(),db,2,1,coderdenttest.Keys,all)
540546
require.NoError(t,err)
541547
require.False(t,entitlements.HasLicense)
@@ -545,7 +551,7 @@ func TestEntitlements(t *testing.T) {
545551

546552
t.Run("MultipleReplicasNotEntitled",func(t*testing.T) {
547553
t.Parallel()
548-
db:=dbmem.New()
554+
db,_:=dbtestutil.NewDB(t)
549555
db.InsertLicense(context.Background(), database.InsertLicenseParams{
550556
Exp:time.Now().Add(time.Hour),
551557
JWT:coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
@@ -565,7 +571,7 @@ func TestEntitlements(t *testing.T) {
565571

566572
t.Run("MultipleReplicasGrace",func(t*testing.T) {
567573
t.Parallel()
568-
db:=dbmem.New()
574+
db,_:=dbtestutil.NewDB(t)
569575
db.InsertLicense(context.Background(), database.InsertLicenseParams{
570576
JWT:coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
571577
Features: license.Features{
@@ -587,7 +593,7 @@ func TestEntitlements(t *testing.T) {
587593

588594
t.Run("MultipleGitAuthNoLicense",func(t*testing.T) {
589595
t.Parallel()
590-
db:=dbmem.New()
596+
db,_:=dbtestutil.NewDB(t)
591597
entitlements,err:=license.Entitlements(context.Background(),db,1,2,coderdenttest.Keys,all)
592598
require.NoError(t,err)
593599
require.False(t,entitlements.HasLicense)
@@ -597,7 +603,7 @@ func TestEntitlements(t *testing.T) {
597603

598604
t.Run("MultipleGitAuthNotEntitled",func(t*testing.T) {
599605
t.Parallel()
600-
db:=dbmem.New()
606+
db,_:=dbtestutil.NewDB(t)
601607
db.InsertLicense(context.Background(), database.InsertLicenseParams{
602608
Exp:time.Now().Add(time.Hour),
603609
JWT:coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
@@ -617,7 +623,7 @@ func TestEntitlements(t *testing.T) {
617623

618624
t.Run("MultipleGitAuthGrace",func(t*testing.T) {
619625
t.Parallel()
620-
db:=dbmem.New()
626+
db,_:=dbtestutil.NewDB(t)
621627
db.InsertLicense(context.Background(), database.InsertLicenseParams{
622628
JWT:coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
623629
GraceAt:time.Now().Add(-time.Hour),

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp