8000 refactor: database level tests · coder/coder@dc45165 · GitHub
[go: up one dir, main page]
Skip to content

Commit dc45165

Browse files
evgeniy-scherbinaevgeniy-scherbina
committed
refactor: database level tests
1 parent ef462b6 commit dc45165

File tree

1 file changed

+95
-65
lines changed

1 file changed

+95
-65
lines changed

‎coderd/database/querier_test.go

Lines changed: 95 additions & 65 deletions
< 1CF5 /tr>
Original file line numberDiff line numberDiff line change
@@ -3648,7 +3648,7 @@ func createTmplVersion(
36483648
}
36493649

36503650
type workspaceBuildOpts struct {
3651-
successfulJob bool
3651+
failedJob bool
36523652
createdAt time.Time
36533653
readyAgents int
36543654
notReadyAgents int
@@ -3665,9 +3665,9 @@ func createPrebuiltWorkspace(
36653665
opts *workspaceBuildOpts,
36663666
) {
36673667
// Create job with corresponding resource and agent
3668-
jobError := sql.NullString{String: "failed", Valid: true}
3669-
if opts != nil && opts.successfulJob {
3670-
jobError = sql.NullString{}
3668+
jobError := sql.NullString{}
3669+
if opts != nil && opts.failedJob {
3670+
jobError = sql.NullString{String: "failed", Valid: true}
36713671
}
36723672
job := dbgen.ProvisionerJob(t, db, nil, database.ProvisionerJob{
36733673
Type: database.ProvisionerJobTypeWorkspaceBuild,
@@ -3878,7 +3878,9 @@ func TestGetPresetsBackoff(t *testing.T) {
38783878

38793879
tmpl := createTemplate(t, db, orgID, userID)
38803880
tmplV1 := createTmplVersion(t, db, tmpl, tmpl.ActiveVersionID, now, nil)
3881-
createPrebuiltWorkspace(t, ctx, db, tmpl, tmplV1, orgID, now, nil)
3881+
createPrebuiltWorkspace(t, ctx, db, tmpl, tmplV1, orgID, now, &workspaceBuildOpts{
3882+
failedJob: true,
3883+
})
38823884

38833885
backoffs, err := db.GetPresetsBackoff(ctx, now.Add(-time.Hour))
38843886
require.NoError(t, err)
@@ -3904,9 +3906,15 @@ func TestGetPresetsBackoff(t *testing.T) {
39043906

39053907
tmpl := createTemplate(t, db, orgID, userID)
39063908
tmplV1 := createTmplVersion(t, db, tmpl, tmpl.ActiveVersionID, now, nil)
3907-
createPrebuiltWorkspace(t, ctx, db, tmpl, tmplV1, orgID, now, nil)
3908-
createPrebuiltWorkspace(t, ctx, db, tmpl, tmplV1, orgID, now, nil)
3909-
createPrebuiltWorkspace(t, ctx, db, tmpl, tmplV1, orgID, now, nil)
3909+
createPrebuiltWorkspace(t, ctx, db, tmpl, tmplV1, orgID, now, &workspaceBuildOpts{
3910+
failedJob: true,
3911+
})
3912+
createPrebuiltWorkspace(t, ctx, db, tmpl, tmplV1, orgID, now, &workspaceBuildOpts{
3913+
failedJob: true,
3914+
})
3915+
createPrebuiltWorkspace(t, ctx, db, tmpl, tmplV1, orgID, now, &workspaceBuildOpts{
3916+
failedJob: true,
3917+
})
39103918

39113919
backoffs, err := db.GetPresetsBackoff(ctx, now.Add(-time.Hour))
39123920
require.NoError(t, err)
@@ -3932,12 +3940,18 @@ func TestGetPresetsBackoff(t *testing.T) {
39323940

39333941
tmpl := createTemplate(t, db, orgID, userID)
39343942
tmplV1 := createTmplVersion(t, db, tmpl, uuid.New(), now, nil)
3935-
createPrebuiltWorkspace(t, ctx, db, tmpl, tmplV1, orgID, now, nil)
3943+
createPrebuiltWorkspace(t, ctx, db, tmpl, tmplV1, orgID, now, &workspaceBuildOpts{
3944+
failedJob: true,
3945+
})
39363946

39373947
// Active Version
39383948
tmplV2 := createTmplVersion(t, db, tmpl, tmpl.ActiveVersionID, now, nil)
3939-
createPrebuiltWorkspace(t, ctx, db, tmpl, tmplV2, orgID, now, nil)
3940-
createPrebuiltWorkspace(t, ctx, db, tmpl, tmplV2, orgID, now, nil)
3949+
createPrebuiltWorkspace(t, ctx, db, tmpl, tmplV2, orgID, now, &workspaceBuildOpts{
3950+
failedJob: true,
3951+
})
3952+
createPrebuiltWorkspace(t, ctx, db, tmpl, tmplV2, orgID, now, &workspaceBuildOpts{
3953+
failedJob: true,
3954+
})
39413955

39423956
backoffs, err := db.GetPresetsBackoff(ctx, now.Add(-time.Hour))
39433957
require.NoError(t, err)
@@ -3963,11 +3977,15 @@ func TestGetPresetsBackoff(t *testing.T) {
39633977

39643978
tmpl1 := createTemplate(t, db, orgID, userID)
39653979
tmpl1V1 := createTmplVersion(t, db, tmpl1, tmpl1.ActiveVersionID, now, nil)
3966-
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, nil)
3980+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
3981+
failedJob: true,
3982+
})
39673983

39683984
tmpl2 := createTemplate(t, db, orgID, userID)
39693985
tmpl2V1 := createTmplVersion(t, db, tmpl2, tmpl2.ActiveVersionID, now, nil)
3970-
createPrebuiltWorkspace(t, ctx, db, tmpl2, tmpl2V1, orgID, now, nil)
3986+
createPrebuiltWorkspace(t, ctx, db, tmpl2, tmpl2V1, orgID, now, &workspaceBuildOpts{
3987+
failedJob: true,
3988+
})
39713989

39723990
backoffs, err := db.GetPresetsBackoff(ctx, now.Add(-time.Hour))
39733991
require.NoError(t, err)
@@ -4001,21 +4019,35 @@ func TestGetPresetsBackoff(t *testing.T) {
40014019

40024020
tmpl1 := createTemplate(t, db, orgID, userID)
40034021
tmpl1V1 := createTmplVersion(t, db, tmpl1, tmpl1.ActiveVersionID, now, nil)
4004-
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, nil)
4022+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4023+
failedJob: true,
4024+
})
40054025

40064026
tmpl2 := createTemplate(t, db, orgID, userID)
40074027
tmpl2V1 := createTmplVersion(t, db, tmpl2, tmpl2.ActiveVersionID, now, nil)
4008-
createPrebuiltWorkspace(t, ctx, db, tmpl2, tmpl2V1, orgID, now, nil)
4009-
createPrebuiltWorkspace(t, ctx, db, tmpl2, tmpl2V1, orgID, now, nil)
4028+
createPrebuiltWorkspace(t, ctx, db, tmpl2, tmpl2V1, orgID, now, &workspaceBuildOpts{
4029+
failedJob: true,
4030+
})
4031+
createPrebuiltWorkspace(t, ctx, db, tmpl2, tmpl2V1, orgID, now, &workspaceBuildOpts{
4032+
failedJob: true,
4033+
})
40104034

40114035
tmpl3 := createTemplate(t, db, orgID, userID)
40124036
tmpl3V1 := createTmplVersion(t, db, tmpl3, uuid.New(), now, nil)
4013-
createPrebuiltWorkspace(t, ctx, db, tmpl3, tmpl3V1, orgID, now, nil)
4037+
createPrebuiltWorkspace(t, ctx, db, tmpl3, tmpl3V1, orgID, now, &workspaceBuildOpts{
4038+
failedJob: true,
4039+
})
40144040

40154041
tmpl3V2 := createTmplVersion(t, db, tmpl3, tmpl3.ActiveVersionID, now, nil)
4016-
createPrebuiltWorkspace(t, ctx, db, tmpl3, tmpl3V2, orgID, now, nil)
4017-
createPrebuiltWorkspace(t, ctx, db, tmpl3, tmpl3V2, orgID, now, nil)
4018-
createPrebuiltWorkspace(t, ctx, db, tmpl3, tmpl3V2, orgID, now, nil)
4042+
createPrebuiltWorkspace(t, ctx, db, tmpl3, tmpl3V2, orgID, now, &workspaceBuildOpts{
4043+
failedJob: true,
4044+
})
4045+
createPrebuiltWorkspace(t, ctx, db, tmpl3, tmpl3V2, orgID, now, &workspaceBuildOpts{
4046+
failedJob: true,
4047+
})
4048+
createPrebuiltWorkspace(t, ctx, db, tmpl3, tmpl3V2, orgID, now, &workspaceBuildOpts{
4049+
failedJob: true,
4050+
})
40194051

40204052
backoffs, err := db.GetPresetsBackoff(ctx, now.Add(-time.Hour))
40214053
require.NoError(t, err)
@@ -4076,9 +4108,7 @@ func TestGetPresetsBackoff(t *testing.T) {
40764108

40774109
tmpl1 := createTemplate(t, db, orgID, userID)
40784110
tmpl1V1 := createTmplVersion(t, db, tmpl1, tmpl1.ActiveVersionID, now, nil)
4079-
successfulJobOpts := workspaceBuildOpts{
4080-
successfulJob: true,
4081-
}
4111+
successfulJobOpts := workspaceBuildOpts{}
40824112
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &successfulJobOpts)
40834113
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &successfulJobOpts)
40844114
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &successfulJobOpts)
@@ -4105,12 +4135,12 @@ func TestGetPresetsBackoff(t *testing.T) {
41054135
DesiredInstances: 1,
41064136
})
41074137
failedJobOpts := workspaceBuildOpts{
4108-
successfulJob: false,
4109-
createdAt: now.Add(-2 * time.Minute),
4138+
failedJob: true,
4139+
createdAt: now.Add(-2 * time.Minute),
41104140
}
41114141
successfulJobOpts := workspaceBuildOpts{
4112-
successfulJob: true,
4113-
createdAt: now.Add(-1 * time.Minute),
4142+
failedJob: false,
4143+
createdAt: now.Add(-1 * time.Minute),
41144144
}
41154145
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &failedJobOpts)
41164146
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &successfulJobOpts)
@@ -4137,20 +4167,20 @@ func TestGetPresetsBackoff(t *testing.T) {
41374167
DesiredInstances: 3,
41384168
})
41394169
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4140-
successfulJob: false,
4141-
createdAt: now.Add(-4 * time.Minute),
4170+
failedJob: true,
4171+
createdAt: now.Add(-4 * time.Minute),
41424172
})
41434173
createPrebuiltWorkspace(t, ctx, d EED3 b, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4144-
successfulJob: true,
4145-
createdAt: now.Add(-3 * time.Minute),
4174+
failedJob: false,
4175+
createdAt: now.Add(-3 * time.Minute),
41464176
})
41474177
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4148-
successfulJob: true,
4149-
createdAt: now.Add(-2 * time.Minute),
4178+
failedJob: false,
4179+
createdAt: now.Add(-2 * time.Minute),
41504180
})
41514181
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4152-
successfulJob: true,
4153-
createdAt: now.Add(-1 * time.Minute),
4182+
failedJob: false,
4183+
createdAt: now.Add(-1 * time.Minute),
41544184
})
41554185

41564186
backoffs, err := db.GetPresetsBackoff(ctx, now.Add(-time.Hour))
@@ -4175,16 +4205,16 @@ func TestGetPresetsBackoff(t *testing.T) {
41754205
DesiredInstances: 3,
41764206
})
41774207
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4178-
successfulJob: false,
4179-
createdAt: now.Add(-3 * time.Minute),
4208+
failedJob: true,
4209+
createdAt: now.Add(-3 * time.Minute),
41804210
})
41814211
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4182-
successfulJob: true,
4183-
createdAt: now.Add(-2 * time.Minute),
4212+
failedJob: false,
4213+
createdAt: now.Add(-2 * time.Minute),
41844214
})
41854215
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4186-
successfulJob: true,
4187-
createdAt: now.Add(-1 * time.Minute),
4216+
failedJob: false,
4217+
createdAt: now.Add(-1 * time.Minute),
41884218
})
41894219

41904220
backoffs, err := db.GetPresetsBackoff(ctx, now.Add(-time.Hour))
@@ -4217,24 +4247,24 @@ func TestGetPresetsBackoff(t *testing.T) {
42174247
DesiredInstances: 3,
42184248
})
42194249
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4220-
successfulJob: false,
4221-
createdAt: now.Add(-lookbackPeriod - time.Minute), // earlier than lookback period - skipped
4250+
failedJob: true,
4251+
createdAt: now.Add(-lookbackPeriod - time.Minute), // earlier than lookback period - skipped
42224252
})
42234253
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4224-
successfulJob: false,
4225-
createdAt: now.Add(-4 * time.Minute), // within lookback period - counted as failed job
4254+
failedJob: true,
4255+
createdAt: now.Add(-4 * time.Minute), // within lookback period - counted as failed job
42264256
})
42274257
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4228-
successfulJob: false,
4229-
createdAt: now.Add(-3 * time.Minute), // within lookback period - counted as failed job
4258+
failedJob: true,
4259+
createdAt: now.Add(-3 * time.Minute), // within lookback period - counted as failed job
42304260
})
42314261
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4232-
successfulJob: true,
4233-
createdAt: now.Add(-2 * time.Minute),
4262+
failedJob: false,
4263+
createdAt: now.Add(-2 * time.Minute),
42344264
})
42354265
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4236-
successfulJob: true,
4237-
createdAt: now.Add(-1 * time.Minute),
4266+
failedJob: false,
4267+
createdAt: now.Add(-1 * time.Minute),
42384268
})
42394269

42404270
backoffs, err := db.GetPresetsBackoff(ctx, now.Add(-lookbackPeriod))
@@ -4267,28 +4297,28 @@ func TestGetPresetsBackoff(t *testing.T) {
42674297
DesiredInstances: 6,
42684298
})
42694299
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4270-
successfulJob: false,
4271-
createdAt: now.Add(-lookbackPeriod - time.Minute), // earlier than lookback period - skipped
4300+
failedJob: true,
4301+
createdAt: now.Add(-lookbackPeriod - time.Minute), // earlier than lookback period - skipped
42724302
})
42734303
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4274-
successfulJob: false,
4275-
createdAt: now.Add(-4 * time.Minute),
4304+
failedJob: true,
4305+
createdAt: now.Add(-4 * time.Minute),
42764306
})
42774307
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4278-
successfulJob: false,
4279-
createdAt: now.Add(-0 * time.Minute),
4308+
failedJob: true,
4309+
createdAt: now.Add(-0 * time.Minute),
42804310
})
42814311
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4282-
successfulJob: false,
4283-
createdAt: now.Add(-3 * time.Minute),
4312+
failedJob: true,
4313+
createdAt: now.Add(-3 * time.Minute),
42844314
})
42854315
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4286-
successfulJob: false,
4287-
createdAt: now.Add(-1 * time.Minute),
4316+
failedJob: true,
4317+
createdAt: now.Add(-1 * time.Minute),
42884318
})
42894319
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4290-
successfulJob: false,
4291-
createdAt: now.Add(-2 * time.Minute),
4320+
failedJob: true,
4321+
createdAt: now.Add(-2 * time.Minute),
42924322
})
42934323

42944324
backoffs, err := db.GetPresetsBackoff(ctx, now.Add(-lookbackPeriod))
@@ -4324,8 +4354,8 @@ func TestGetPresetsBackoff(t *testing.T) {
43244354
})
43254355

43264356
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4327-
successfulJob: false,
4328-
createdAt: now.Add(-lookbackPeriod - time.Minute), // earlier than lookback period - skipped
4357+
failedJob: true,
4358+
createdAt: now.Add(-lookbackPeriod - time.Minute), // earlier than lookback period - skipped
43294359
})
43304360

43314361
backoffs, err := db.GetPresetsBackoff(ctx, now.Add(-lookbackPeriod))

0 commit comments

Comments
 (0)
0