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

Commit 9c8a352

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

File tree

1 file changed

+41
-41
lines changed

1 file changed

+41
-41
lines changed

‎coderd/database/querier_test.go

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -3647,7 +3647,7 @@ func createTmplVersion(
36473647
}
36483648
}
36493649

3650-
type workspaceBuildOpts struct {
3650+
type createPrebuiltWorkspaceOpts struct {
36513651
failedJob bool
36523652
createdAt time.Time
36533653
readyAgents int
@@ -3662,7 +3662,7 @@ func createPrebuiltWorkspace(
36623662
extTmplVersion extTmplVersion,
36633663
orgID uuid.UUID,
36643664
now time.Time,
3665-
opts *workspaceBuildOpts,
3665+
opts *createPrebuiltWorkspaceOpts,
36663666
) {
36673667
// Create job with corresponding resource and agent
36683668
jobError := sql.NullString{}
@@ -3832,7 +3832,7 @@ func TestWorkspacePrebuildsView(t *testing.T) {
38323832

38333833
tmpl := createTemplate(t, db, orgID, userID)
38343834
tmplV1 := createTmplVersion(t, db, tmpl, tmpl.ActiveVersionID, now, nil)
3835-
createPrebuiltWorkspace(t, ctx, db, tmpl, tmplV1, orgID, now, &workspaceBuildOpts{
3835+
createPrebuiltWorkspace(t, ctx, db, tmpl, tmplV1, orgID, now, &createPrebuiltWorkspaceOpts{
38363836
readyAgents: tc.readyAgents,
38373837
notReadyAgents: tc.notReadyAgents,
38383838
})
@@ -3878,7 +3878,7 @@ 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, &workspaceBuildOpts{
3881+
createPrebuiltWorkspace(t, ctx, db, tmpl, tmplV1, orgID, now, &createPrebuiltWorkspaceOpts{
38823882
failedJob: true,
38833883
})
38843884

@@ -3906,13 +3906,13 @@ func TestGetPresetsBackoff(t *testing.T) {
39063906

39073907
tmpl := createTemplate(t, db, orgID, userID)
39083908
tmplV1 := createTmplVersion(t, db, tmpl, tmpl.ActiveVersionID, now, nil)
3909-
createPrebuiltWorkspace(t, ctx, db, tmpl, tmplV1, orgID, now, &workspaceBuildOpts{
3909+
createPrebuiltWorkspace(t, ctx, db, tmpl, tmplV1, orgID, now, &createPrebuiltWorkspaceOpts{
39103910
failedJob: true,
39113911
})
3912-
createPrebuiltWorkspace(t, ctx, db, tmpl, tmplV1, orgID, now, &workspaceBuildOpts{
3912+
createPrebuiltWorkspace(t, ctx, db, tmpl, tmplV1, orgID, now, &createPrebuiltWorkspaceOpts{
39133913
failedJob: true,
39143914
})
3915-
createPrebuiltWorkspace(t, ctx, db, tmpl, tmplV1, orgID, now, &workspaceBuildOpts{
3915+
createPrebuiltWorkspace(t, ctx, db, tmpl, tmplV1, orgID, now, &createPrebuiltWorkspaceOpts{
39163916
failedJob: true,
39173917
})
39183918

@@ -3940,16 +3940,16 @@ func TestGetPresetsBackoff(t *testing.T) {
39403940

39413941
tmpl := createTemplate(t, db, orgID, userID)
39423942
tmplV1 := createTmplVersion(t, db, tmpl, uuid.New(), now, nil)
3943-
createPrebuiltWorkspace(t, ctx, db, tmpl, tmplV1, orgID, now, &workspaceBuildOpts{
3943+
createPrebuiltWorkspace(t, ctx, db, tmpl, tmplV1, orgID, now, &createPrebuiltWorkspaceOpts{
39443944
failedJob: true,
39453945
})
39463946

39473947
// Active Version
39483948
tmplV2 := createTmplVersion(t, db, tmpl, tmpl.ActiveVersionID, now, nil)
3949-
createPrebuiltWorkspace(t, ctx, db, tmpl, tmplV2, orgID, now, &workspaceBuildOpts{
3949+
createPrebuiltWorkspace(t, ctx, db, tmpl, tmplV2, orgID, now, &createPrebuiltWorkspaceOpts{
39503950
failedJob: true,
39513951
})
3952-
createPrebuiltWorkspace(t, ctx, db, tmpl, tmplV2, orgID, now, &workspaceBuildOpts{
3952+
createPrebuiltWorkspace(t, ctx, db, tmpl, tmplV2, orgID, now, &createPrebuiltWorkspaceOpts{
39533953
failedJob: true,
39543954
})
39553955

@@ -3977,13 +3977,13 @@ func TestGetPresetsBackoff(t *testing.T) {
39773977

39783978
tmpl1 := createTemplate(t, db, orgID, userID)
39793979
tmpl1V1 := createTmplVersion(t, db, tmpl1, tmpl1.ActiveVersionID, now, nil)
3980-
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
3980+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &createPrebuiltWorkspaceOpts{
39813981
failedJob: true,
39823982
})
39833983

39843984
tmpl2 := createTemplate(t, db, orgID, userID)
39853985
tmpl2V1 := createTmplVersion(t, db, tmpl2, tmpl2.ActiveVersionID, now, nil)
3986-
createPrebuiltWorkspace(t, ctx, db, tmpl2, tmpl2V1, orgID, now, &workspaceBuildOpts{
3986+
createPrebuiltWorkspace(t, ctx, db, tmpl2, tmpl2V1, orgID, now, &createPrebuiltWorkspaceOpts{
39873987
failedJob: true,
39883988
})
39893989

@@ -4019,33 +4019,33 @@ func TestGetPresetsBackoff(t *testing.T) {
40194019

40204020
tmpl1 := createTemplate(t, db, orgID, userID)
40214021
tmpl1V1 := createTmplVersion(t, db, tmpl1, tmpl1.ActiveVersionID, now, nil)
4022-
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4022+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &createPrebuiltWorkspaceOpts{
40234023
failedJob: true,
40244024
})
40254025

40264026
tmpl2 := createTemplate(t, db, orgID, userID)
40274027
tmpl2V1 := createTmplVersion(t, db, tmpl2, tmpl2.ActiveVersionID, now, nil)
4028-
createPrebuiltWorkspace(t, ctx, db, tmpl2, tmpl2V1, orgID, now, &workspaceBuildOpts{
4028+
createPrebuiltWorkspace(t, ctx, db, tmpl2, tmpl2V1, orgID, now, &createPrebuiltWorkspaceOpts{
40294029
failedJob: true,
40304030
})
4031-
createPrebuiltWorkspace(t, ctx, db, tmpl2, tmpl2V1, orgID, now, &workspaceBuildOpts{
4031+
createPrebuiltWorkspace(t, ctx, db, tmpl2, tmpl2V1, orgID, now, &createPrebuiltWorkspaceOpts{
40324032
failedJob: true,
40334033
})
40344034

40354035
tmpl3 := createTemplate(t, db, orgID, userID)
40364036
tmpl3V1 := createTmplVersion(t, db, tmpl3, uuid.New(), now, nil)
4037-
createPrebuiltWorkspace(t, ctx, db, tmpl3, tmpl3V1, orgID, now, &workspaceBuildOpts{
4037+
createPrebuiltWorkspace(t, ctx, db, tmpl3, tmpl3V1, orgID, now, &createPrebuiltWorkspaceOpts{
40384038
failedJob: true,
40394039
})
40404040

40414041
tmpl3V2 := createTmplVersion(t, db, tmpl3, tmpl3.ActiveVersionID, now, nil)
4042-
createPrebuiltWorkspace(t, ctx, db, tmpl3, tmpl3V2, orgID, now, &workspaceBuildOpts{
4042+
createPrebuiltWorkspace(t, ctx, db, tmpl3, tmpl3V2, orgID, now, &createPrebuiltWorkspaceOpts{
40434043
failedJob: true,
40444044
})
4045-
createPrebuiltWorkspace(t, ctx, db, tmpl3, tmpl3V2, orgID, now, &workspaceBuildOpts{
4045+
createPrebuiltWorkspace(t, ctx, db, tmpl3, tmpl3V2, orgID, now, &createPrebuiltWorkspaceOpts{
40464046
failedJob: true,
40474047
})
4048-
createPrebuiltWorkspace(t, ctx, db, tmpl3, tmpl3V2, orgID, now, &workspaceBuildOpts{
4048+
createPrebuiltWorkspace(t, ctx, db, tmpl3, tmpl3V2, orgID, now, &createPrebuiltWorkspaceOpts{
40494049
failedJob: true,
40504050
})
40514051

@@ -4108,7 +4108,7 @@ func TestGetPresetsBackoff(t *testing.T) {
41084108

41094109
tmpl1 := createTemplate(t, db, orgID, userID)
41104110
tmpl1V1 := createTmplVersion(t, db, tmpl1, tmpl1.ActiveVersionID, now, nil)
4111-
successfulJobOpts := workspaceBuildOpts{}
4111+
successfulJobOpts := createPrebuiltWorkspaceOpts{}
41124112
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &successfulJobOpts)
41134113
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &successfulJobOpts)
41144114
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &successfulJobOpts)
@@ -4134,11 +4134,11 @@ func TestGetPresetsBackoff(t *testing.T) {
41344134
tmpl1V1 := createTmplVersion(t, db, tmpl1, tmpl1.ActiveVersionID, now, &tmplVersionOpts{
41354135
DesiredInstances: 1,
41364136
})
4137-
failedJobOpts := workspaceBuildOpts{
4137+
failedJobOpts := createPrebuiltWorkspaceOpts{
41384138
failedJob: true,
41394139
createdAt: now.Add(-2 * time.Minute),
41404140
}
4141-
successfulJobOpts := workspaceBuildOpts{
4141+
successfulJobOpts := createPrebuiltWorkspaceOpts{
41424142
failedJob: false,
41434143
createdAt: now.Add(-1 * time.Minute),
41444144
}
@@ -4166,19 +4166,19 @@ func TestGetPresetsBackoff(t *testing.T) {
41664166
tmpl1V1 := createTmplVersion(t, db, tmpl1, tmpl1.ActiveVersionID, now, &tmplVersionOpts{
41674167
DesiredInstances: 3,
41684168
})
4169-
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4169+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &createPrebuiltWorkspaceOpts{
41704170
failedJob: true,
41714171
createdAt: now.Add(-4 * time.Minute),
41724172
})
4173-
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4173+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &createPrebuiltWorkspaceOpts{
41744174
failedJob: false,
41754175
createdAt: now.Add(-3 * time.Minute),
41764176
})
4177-
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4177+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &createPrebuiltWorkspaceOpts{
41784178
failedJob: false,
41794179
createdAt: now.Add(-2 * time.Minute),
41804180
})
4181-
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4181+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &createPrebuiltWorkspaceOpts{
41824182
failedJob: false,
41834183
createdAt: now.Add(-1 * time.Minute),
41844184
})
@@ -4204,15 +4204,15 @@ func TestGetPresetsBackoff(t *testing.T) {
42044204
tmpl1V1 := createTmplVersion(t, db, tmpl1, tmpl1.ActiveVersionID, now, &tmplVersionOpts{
42054205
DesiredInstances: 3,
42064206
})
4207-
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4207+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &createPrebuiltWorkspaceOpts{
42084208
failedJob: true,
42094209
createdAt: now.Add(-3 * time.Minute),
42104210
})
4211-
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4211+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &createPrebuiltWorkspaceOpts{
42124212
failedJob: false,
42134213
createdAt: now.Add(-2 * time.Minute),
42144214
})
4215-
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4215+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &createPrebuiltWorkspaceOpts{
42164216
failedJob: false,
42174217
createdAt: now.Add(-1 * time.Minute),
42184218
})
@@ -4246,23 +4246,23 @@ func TestGetPresetsBackoff(t *testing.T) {
42464246
tmpl1V1 := createTmplVersion(t, db, tmpl1, tmpl1.ActiveVersionID, now, &tmplVersionOpts{
42474247
DesiredInstances: 3,
42484248
})
4249-
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4249+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &createPrebuiltWorkspaceOpts{
42504250
failedJob: true,
42514251
createdAt: now.Add(-lookbackPeriod - time.Minute), // earlier than lookback period - skipped
42524252
})
4253-
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4253+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &createPrebuiltWorkspaceOpts{
42544254
failedJob: true,
42554255
createdAt: now.Add(-4 * time.Minute), // within lookback period - counted as failed job
42564256
})
4257-
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4257+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &createPrebuiltWorkspaceOpts{
42584258
failedJob: true,
42594259
createdAt: now.Add(-3 * time.Minute), // within lookback period - counted as failed job
42604260
})
4261-
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4261+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &createPrebuiltWorkspaceOpts{
42624262
failedJob: false,
42634263
createdAt: now.Add(-2 * time.Minute),
42644264
})
4265-
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4265+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &createPrebuiltWorkspaceOpts{
42664266
failedJob: false,
42674267
createdAt: now.Add(-1 * time.Minute),
42684268
})
@@ -4296,27 +4296,27 @@ func TestGetPresetsBackoff(t *testing.T) {
42964296
tmpl1V1 := createTmplVersion(t, db, tmpl1, tmpl1.ActiveVersionID, now, &tmplVersionOpts{
42974297
DesiredInstances: 6,
42984298
})
4299-
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4299+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &createPrebuiltWorkspaceOpts{
43004300
failedJob: true,
43014301
createdAt: now.Add(-lookbackPeriod - time.Minute), // earlier than lookback period - skipped
43024302
})
4303-
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4303+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &createPrebuiltWorkspaceOpts{
43044304
failedJob: true,
43054305
createdAt: now.Add(-4 * time.Minute),
43064306
})
4307-
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4307+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &createPrebuiltWorkspaceOpts{
43084308
failedJob: true,
43094309
createdAt: now.Add(-0 * time.Minute),
43104310
})
4311-
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4311+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &createPrebuiltWorkspaceOpts{
43124312
failedJob: true,
43134313
createdAt: now.Add(-3 * time.Minute),
43144314
})
4315-
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4315+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &createPrebuiltWorkspaceOpts{
43164316
failedJob: true,
43174317
createdAt: now.Add(-1 * time.Minute),
43184318
})
4319-
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4319+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &createPrebuiltWorkspaceOpts{
43204320
failedJob: true,
43214321
createdAt: now.Add(-2 * time.Minute),
43224322
})
@@ -4353,7 +4353,7 @@ func TestGetPresetsBackoff(t *testing.T) {
43534353
DesiredInstances: 1,
43544354
})
43554355

4356-
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4356+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &createPrebuiltWorkspaceOpts{
43574357
failedJob: true,
43584358
createdAt: now.Add(-lookbackPeriod - time.Minute), // earlier than lookback period - skipped
43594359
})

0 commit comments

Comments
 (0)
0