10000 refactor: helper funcs in db-level tests · coder/coder@eb80919 · GitHub
[go: up one dir, main page]
Skip to content

Commit eb80919

Browse files
evgeniy-scherbinaevgeniy-scherbina
committed
refactor: helper funcs in db-level tests
1 parent 9c8a352 commit eb80919

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

‎coderd/database/querier_test.go

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3588,7 +3588,7 @@ func TestOrganizationDeleteTrigger(t *testing.T) {
35883588
})
35893589
}
35903590

3591-
type extTmplVersion struct {
3591+
type templateVersionWithPreset struct {
35923592
database.TemplateVersion
35933593
preset database.TemplateVersionPreset
35943594
}
@@ -3608,14 +3608,14 @@ type tmplVersionOpts struct {
36083608
DesiredInstances int
36093609
}
36103610

3611-
func createTmplVersion(
3611+
func createTmplVersionAndPreset(
36123612
t *testing.T,
36133613
db database.Store,
36143614
tmpl database.Template,
36153615
versionId uuid.UUID,
36163616
now time.Time,
36173617
opts *tmplVersionOpts,
3618-
) extTmplVersion {
3618+
) templateVersionWithPreset {
36193619
// Create template version with corresponding preset and preset prebuild
36203620
tmplVersion := dbgen.TemplateVersion(t, db, database.TemplateVersion{
36213621
ID: versionId,
@@ -3641,7 +3641,7 @@ func createTmplVersion(
36413641
},
36423642
})
36433643

3644-
return extTmplVersion{
3644+
return templateVersionWithPreset{
36453645
TemplateVersion: tmplVersion,
36463646
preset: preset,
36473647
}
@@ -3659,7 +3659,7 @@ func createPrebuiltWorkspace(
36593659
ctx context.Context,
36603660
db database.Store,
36613661
tmpl database.Template,
3662-
extTmplVersion extTmplVersion,
3662+
extTmplVersion templateVersionWithPreset,
36633663
orgID uuid.UUID,
36643664
now time.Time,
36653665
opts *createPrebuiltWorkspaceOpts,
@@ -3831,7 +3831,7 @@ func TestWorkspacePrebuildsView(t *testing.T) {
38313831
})
38323832

38333833
tmpl := createTemplate(t, db, orgID, userID)
3834-
tmplV1 := createTmplVersion(t, db, tmpl, tmpl.ActiveVersionID, now, nil)
3834+
tmplV1 := createTmplVersionAndPreset(t, db, tmpl, tmpl.ActiveVersionID, now, nil)
38353835
createPrebuiltWorkspace(t, ctx, db, tmpl, tmplV1, orgID, now, &createPrebuiltWorkspaceOpts{
38363836
readyAgents: tc.readyAgents,
38373837
notReadyAgents: tc.notReadyAgents,
@@ -3877,7 +3877,7 @@ func TestGetPresetsBackoff(t *testing.T) {
38773877
})
38783878

38793879
tmpl := createTemplate(t, db, orgID, userID)
3880-
tmplV1 := createTmplVersion(t, db, tmpl, tmpl.ActiveVersionID, now, nil)
3880+
tmplV1 := createTmplVersionAndPreset(t, db, tmpl, tmpl.ActiveVersionID, now, nil)
38813881
createPrebuiltWorkspace(t, ctx, db, tmpl, tmplV1, orgID, now, &createPrebuiltWorkspaceOpts{
38823882
failedJob: true,
38833883
})
@@ -3905,7 +3905,7 @@ func TestGetPresetsBackoff(t *testing.T) {
39053905
})
39063906

39073907
tmpl := createTemplate(t, db, orgID, userID)
3908-
tmplV1 := createTmplVersion(t, db, tmpl, tmpl.ActiveVersionID, now, nil)
3908+
tmplV1 := createTmplVersionAndPreset(t, db, tmpl, tmpl.ActiveVersionID, now, nil)
39093909
createPrebuiltWorkspace(t, ctx, db, tmpl, tmplV1, orgID, now, &createPrebuiltWorkspaceOpts{
39103910
failedJob: true,
39113911
})
@@ -3939,13 +3939,13 @@ func TestGetPresetsBackoff(t *testing.T) {
39393939
})
39403940

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

39473947
// Active Version
3948-
tmplV2 := createTmplVersion(t, db, tmpl, tmpl.ActiveVersionID, now, nil)
3948+
tmplV2 := createTmplVersionAndPreset(t, db, tmpl, tmpl.ActiveVersionID, now, nil)
39493949
createPrebuiltWorkspace(t, ctx, db, tmpl, tmplV2, orgID, now, &createPrebuiltWorkspaceOpts{
39503950
failedJob: true,
39513951
})
@@ -3976,13 +3976,13 @@ func TestGetPresetsBackoff(t *testing.T) {
39763976
})
39773977

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

39843984
tmpl2 := createTemplate(t, db, orgID, userID)
3985-
tmpl2V1 := createTmplVersion(t, db, tmpl2, tmpl2.ActiveVersionID, now, nil)
3985+
tmpl2V1 := createTmplVersionAndPreset(t, db, tmpl2, tmpl2.ActiveVersionID, now, nil)
39863986
createPrebuiltWorkspace(t, ctx, db, tmpl2, tmpl2V1, orgID, now, &createPrebuiltWorkspaceOpts{
39873987
failedJob: true,
39883988
})
@@ -4018,13 +4018,13 @@ func TestGetPresetsBackoff(t *testing.T) {
40184018
})
40194019

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

40264026
tmpl2 := createTemplate(t, db, orgID, userID)
4027-
tmpl2V1 := createTmplVersion(t, db, tmpl2, tmpl2.ActiveVersionID, now, nil)
4027+
tmpl2V1 := createTmplVersionAndPreset(t, db, tmpl2, tmpl2.ActiveVersionID, now, nil)
40284028
createPrebuiltWorkspace(t, ctx, db, tmpl2, tmpl2V1, orgID, now, &createPrebuiltWorkspaceOpts{
40294029
failedJob: true,
40304030
})
@@ -4033,12 +4033,12 @@ func TestGetPresetsBackoff(t *testing.T) {
40334033
})
40344034

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

4041-
tmpl3V2 := createTmplVersion(t, db, tmpl3, tmpl3.ActiveVersionID, now, nil)
4041+
tmpl3V2 := createTmplVersionAndPreset(t, db, tmpl3, tmpl3.ActiveVersionID, now, nil)
40424042
createPrebuiltWorkspace(t, ctx, db, tmpl3, tmpl3V2, orgID, now, &createPrebuiltWorkspaceOpts{
40434043
failedJob: true,
40444044
})
@@ -4086,7 +4086,7 @@ func TestGetPresetsBackoff(t *testing.T) {
40864086
})
40874087

40884088
tmpl1 := createTemplate(t, db, orgID, userID)
4089-
tmpl1V1 := createTmplVersion(t, db, tmpl1, tmpl1.ActiveVersionID, now, nil)
4089+
tmpl1V1 := createTmplVersionAndPreset(t, db, tmpl1, tmpl1.ActiveVersionID, now, nil)
40904090
_ = tmpl1V1
40914091

40924092
backoffs, err := db.GetPresetsBackoff(ctx, now.Add(-time.Hour))
@@ -4107,7 +4107,7 @@ func TestGetPresetsBackoff(t *testing.T) {
41074107
})
41084108

41094109
tmpl1 := createTemplate(t, db, orgID, userID)
4110-
tmpl1V1 := createTmplVersion(t, db, tmpl1, tmpl1.ActiveVersionID, now, nil)
4110+
tmpl1V1 := createTmplVersionAndPreset(t, db, tmpl1, tmpl1.ActiveVersionID, now, nil)
41114111
successfulJobOpts := createPrebuiltWorkspaceOpts{}
41124112
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &successfulJobOpts)
41134113
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &successfulJobOpts)
@@ -4131,7 +4131,7 @@ func TestGetPresetsBackoff(t *testing.T) {
41314131
})
41324132

41334133
tmpl1 := createTemplate(t, db, orgID, userID)
4134-
tmpl1V1 := createTmplVersion(t, db, tmpl1, tmpl1.ActiveVersionID, now, &tmplVersionOpts{
4134+
tmpl1V1 := createTmplVersionAndPreset(t, db, tmpl1, tmpl1.ActiveVersionID, now, &tmplVersionOpts{
41354135
DesiredInstances: 1,
41364136
})
41374137
failedJobOpts := createPrebuiltWorkspaceOpts{
@@ -4163,7 +4163,7 @@ func TestGetPresetsBackoff(t *testing.T) {
41634163
})
41644164

41654165
tmpl1 := createTemplate(t, db, orgID, userID)
4166-
tmpl1V1 := createTmplVersion(t, db, tmpl1, tmpl1.ActiveVersionID, now, &tmplVersionOpts{
4166+
tmpl1V1 := createTmplVersionAndPreset(t, db, tmpl1, tmpl1.ActiveVersionID, now, &tmplVersionOpts{
41674167
DesiredInstances: 3,
41684168
})
41694169
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &createPrebuiltWorkspaceOpts{
@@ -4201,7 +4201,7 @@ func TestGetPresetsBackoff(t *testing.T) {
42014201
})
42024202

42034203
tmpl1 := createTemplate(t, db, orgID, userID)
4204-
tmpl1V1 := createTmplVersion(t, db, tmpl1, tmpl1.ActiveVersionID, now, &tmplVersionOpts{
4204+
tmpl1V1 := createTmplVersionAndPreset(t, db, tmpl1, tmpl1.ActiveVersionID, now, &tmplVersionOpts{
42054205
DesiredInstances: 3,
42064206
})
42074207
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &createPrebuiltWorkspaceOpts{
@@ -4243,7 +4243,7 @@ func TestGetPresetsBackoff(t *testing.T) {
42434243
lookbackPeriod := time.Hour
42444244

42454245
tmpl1 := createTemplate(t, db, orgID, userID)
4246-
tmpl1V1 := createTmplVersion(t, db, tmpl1, tmpl1.ActiveVersionID, now, &tmplVersionOpts{
4246+
tmpl1V1 := createTmplVersionAndPreset(t, db, tmpl1, tmpl1.ActiveVersionID, now, &tmplVersionOpts{
42474247
DesiredInstances: 3,
42484248
})
42494249
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &createPrebuiltWorkspaceOpts{
@@ -4293,7 +4293,7 @@ func TestGetPresetsBackoff(t *testing.T) {
42934293
lookbackPeriod := time.Hour
42944294

42954295
tmpl1 := createTemplate(t, db, orgID, userID)
4296-
tmpl1V1 := createTmplVersion(t, db, tmpl1, tmpl1.ActiveVersionID, now, &tmplVersionOpts{
4296+
tmpl1V1 := createTmplVersionAndPreset(t, db, tmpl1, tmpl1.ActiveVersionID, now, &tmplVersionOpts{
42974297
DesiredInstances: 6,
42984298
})
42994299
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &createPrebuiltWorkspaceOpts{
@@ -4349,7 +4349,7 @@ func TestGetPresetsBackoff(t *testing.T) {
43494349
lookbackPeriod := time.Hour
43504350

43514351
tmpl1 := createTemplate(t, db, orgID, userID)
4352-
tmpl1V1 := createTmplVersion(t, db, tmpl1, tmpl1.ActiveVersionID, now, &tmplVersionOpts{
4352+
tmpl1V1 := createTmplVersionAndPreset(t, db, tmpl1, tmpl1.ActiveVersionID, now, &tmplVersionOpts{
43534353
DesiredInstances: 1,
43544354
})
43554355

0 commit comments

Comments
 (0)
0