8000 refactor: rename helper func in test package · coder/coder@ef462b6 · GitHub
[go: up one dir, main page]
Skip to content

Commit ef462b6

Browse files
evgeniy-scherbinaevgeniy-scherbina
committed
refactor: rename helper func in test package
1 parent bff34ea commit ef462b6

File tree

1 file changed

+42
-42
lines changed

1 file changed

+42
-42
lines changed

‎coderd/database/querier_test.go

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3654,7 +3654,7 @@ type workspaceBuildOpts struct {
36543654
notReadyAgents int
36553655
}
36563656

3657-
func createWorkspaceBuild(
3657+
func createPrebuiltWorkspace(
36583658
t *testing.T,
36593659
ctx context.Context,
36603660
db database.Store,
@@ -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-
createWorkspaceBuild(t, ctx, db, tmpl, tmplV1, orgID, now, &workspaceBuildOpts{
3835+
createPrebuiltWorkspace(t, ctx, db, tmpl, tmplV1, orgID, now, &workspaceBuildOpts{
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-
createWorkspaceBuild(t, ctx, db, tmpl, tmplV1, orgID, now, nil)
3881+
createPrebuiltWorkspace(t, ctx, db, tmpl, tmplV1, orgID, now, nil)
38823882

38833883
backoffs, err := db.GetPresetsBackoff(ctx, now.Add(-time.Hour))
38843884
require.NoError(t, err)
@@ -3904,9 +3904,9 @@ func TestGetPresetsBackoff(t *testing.T) {
39043904

39053905
tmpl := createTemplate(t, db, orgID, userID)
39063906
tmplV1 := createTmplVersion(t, db, tmpl, tmpl.ActiveVersionID, now, nil)
3907-
createWorkspaceBuild(t, ctx, db, tmpl, tmplV1, orgID, now, nil)
3908-
createWorkspaceBuild(t, ctx, db, tmpl, tmplV1, orgID, now, nil)
3909-
createWorkspaceBuild(t, ctx, db, tmpl, tmplV1, orgID, 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)
39103910

39113911
backoffs, err := db.GetPresetsBackoff(ctx, now.Add(-time.Hour))
39123912
require.NoError(t, err)
@@ -3932,12 +3932,12 @@ func TestGetPresetsBackoff(t *testing.T) {
39323932

39333933
tmpl := createTemplate(t, db, orgID, userID)
39343934
tmplV1 := createTmplVersion(t, db, tmpl, uuid.New(), now, nil)
3935-
createWorkspaceBuild(t, ctx, db, tmpl, tmplV1, orgID, now, nil)
3935+
createPrebuiltWorkspace(t, ctx, db, tmpl, tmplV1, orgID, now, nil)
39363936

39373937
// Active Version
39383938
tmplV2 := createTmplVersion(t, db, tmpl, tmpl.ActiveVersionID, now, nil)
3939-
createWorkspaceBuild(t, ctx, db, tmpl, tmplV2, orgID, now, nil)
3940-
createWorkspaceBuild(t, ctx, db, tmpl, tmplV2, orgID, now, nil)
3939+
createPrebuiltWorkspace(t, ctx, db, tmpl, tmplV2, orgID, now, nil)
3940+
createPrebuiltWorkspace(t, ctx, db, tmpl, tmplV2, orgID, now, nil)
39413941

39423942
backoffs, err := db.GetPresetsBackoff(ctx, now.Add(-time.Hour))
39433943
require.NoError(t, err)
@@ -3963,11 +3963,11 @@ func TestGetPresetsBackoff(t *testing.T) {
39633963

39643964
tmpl1 := createTemplate(t, db, orgID, userID)
39653965
tmpl1V1 := createTmplVersion(t, db, tmpl1, tmpl1.ActiveVersionID, now, nil)
3966-
createWorkspaceBuild(t, ctx, db, tmpl1, tmpl1V1, orgID, now, nil)
3966+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, nil)
39673967

39683968
tmpl2 := createTemplate(t, db, orgID, userID)
39693969
tmpl2V1 := createTmplVersion(t, db, tmpl2, tmpl2.ActiveVersionID, now, nil)
3970-
createWorkspaceBuild(t, ctx, db, tmpl2, tmpl2V1, orgID, now, nil)
3970+
createPrebuiltWorkspace(t, ctx, db, tmpl2, tmpl2V1, orgID, now, nil)
39713971

39723972
backoffs, err := db.GetPresetsBackoff(ctx, now.Add(-time.Hour))
39733973
require.NoError(t, err)
@@ -4001,21 +4001,21 @@ func TestGetPresetsBackoff(t *testing.T) {
40014001

40024002
tmpl1 := createTemplate(t, db, orgID, userID)
40034003
tmpl1V1 := createTmplVersion(t, db, tmpl1, tmpl1.ActiveVersionID, now, nil)
4004-
createWorkspaceBuild(t, ctx, db, tmpl1, tmpl1V1, orgID, now, nil)
4004+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, nil)
40054005

40064006
tmpl2 := createTemplate(t, db, orgID, userID)
40074007
tmpl2V1 := createTmplVersion(t, db, tmpl2, tmpl2.ActiveVersionID, now, nil)
4008-
createWorkspaceBuild(t, ctx, db, tmpl2, tmpl2V1, orgID, now, nil)
4009-
createWorkspaceBuild(t, ctx, db, tmpl2, tmpl2V1, orgID, now, nil)
4008+
createPrebuiltWorkspace(t, ctx, db, tmpl2, tmpl2V1, orgID, now, nil)
4009+
createPrebuiltWorkspace(t, ctx, db, tmpl2, tmpl2V1, orgID, now, nil)
40104010

40114011
tmpl3 := createTemplate(t, db, orgID, userID)
40124012
tmpl3V1 := createTmplVersion(t, db, tmpl3, uuid.New(), now, nil)
4013-
createWorkspaceBuild(t, ctx, db, tmpl3, tmpl3V1, orgID, now, nil)
4013+
createPrebuiltWorkspace(t, ctx, db, tmpl3, tmpl3V1, orgID, now, nil)
40144014

40154015
tmpl3V2 := createTmplVersion(t, db, tmpl3, tmpl3.ActiveVersionID, now, nil)
4016-
createWorkspaceBuild(t, ctx, db, tmpl3, tmpl3V2, orgID, now, nil)
4017-
createWorkspaceBuild(t, ctx, db, tmpl3, tmpl3V2, orgID, now, nil)
4018-
createWorkspaceBuild(t, ctx, db, tmpl3, tmpl3V2, orgID, 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)
40194019

40204020
backoffs, err := db.GetPresetsBackoff(ctx, now.Add(-time.Hour))
40214021
require.NoError(t, err)
@@ -4079,9 +4079,9 @@ func TestGetPresetsBackoff(t *testing.T) {
40794079
successfulJobOpts := workspaceBuildOpts{
40804080
successfulJob: true,
40814081
}
4082-
createWorkspaceBuild(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &successfulJobOpts)
4083-
createWorkspaceBuild(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &successfulJobOpts)
4084-
createWorkspaceBuild(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &successfulJobOpts)
4082+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &successfulJobOpts)
4083+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &successfulJobOpts)
4084+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &successfulJobOpts)
40854085

40864086
backoffs, err := db.GetPresetsBackoff(ctx, now.Add(-time.Hour))
40874087
require.NoError(t, err)
@@ -4112,8 +4112,8 @@ func TestGetPresetsBackoff(t *testing.T) {
41124112
successfulJob: true,
41134113
createdAt: now.Add(-1 * time.Minute),
41144114
}
4115-
createWorkspaceBuild(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &failedJobOpts)
4116-
createWorkspaceBuild(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &successfulJobOpts)
4115+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &failedJobOpts)
4116+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &successfulJobOpts)
41174117

41184118
backoffs, err := db.GetPresetsBackoff(ctx, now.Add(-time.Hour))
41194119
require.NoError(t, err)
@@ -4136,19 +4136,19 @@ func TestGetPresetsBackoff(t *testing.T) {
41364136
tmpl1V1 := createTmplVersion(t, db, tmpl1, tmpl1.ActiveVersionID, now, &tmplVersionOpts{
41374137
DesiredInstances: 3,
41384138
})
4139-
createWorkspaceBuild(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4139+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
41404140
successfulJob: false,
41414141
createdAt: now.Add(-4 * time.Minute),
41424142
})
4143-
createWorkspaceBuild(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4143+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
41444144
successfulJob: true,
41454145
createdAt: now.Add(-3 * time.Minute),
41464146
})
4147-
createWorkspaceBuild(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4147+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
41484148
successfulJob: true,
41494149
createdAt: now.Add(-2 * time.Minute),
41504150
})
4151-
createWorkspaceBuild(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4151+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
41524152
successfulJob: true,
41534153
createdAt: now.Add(-1 * time.Minute),
41544154
})
@@ -4174,15 +4174,15 @@ func TestGetPresetsBackoff(t *testing.T) {
41744174
tmpl1V1 := createTmplVersion(t, db, tmpl1, tmpl1.ActiveVersionID, now, &tmplVersionOpts{
41754175
DesiredInstances: 3,
41764176
})
4177-
createWorkspaceBuild(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4177+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
41784178
successfulJob: false,
41794179
createdAt: now.Add(-3 * time.Minute),
41804180
})
4181-
createWorkspaceBuild(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4181+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
41824182
successfulJob: true,
41834183
createdAt: now.Add(-2 * time.Minute),
41844184
})
4185-
createWorkspaceBuild(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4185+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
41864186
successfulJob: true,
41874187
createdAt: now.Add(-1 * time.Minute),
41884188
})
@@ -4216,23 +4216,23 @@ func TestGetPresetsBackoff(t *testing.T) {
42164216
tmpl1V1 := createTmplVersion(t, db, tmpl1, tmpl1.ActiveVersionID, now, &tmplVersionOpts{
42174217
DesiredInstances: 3,
42184218
})
4219-
createWorkspaceBuild(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4219+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
42204220
successfulJob: false,
42214221
createdAt: now.Add(-lookbackPeriod - time.Minute), // earlier than lookback period - skipped
42224222
})
4223-
createWorkspaceBuild(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4223+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
42244224
successfulJob: false,
42254225
createdAt: now.Add(-4 * time.Minute), // within lookback period - counted as failed job
42264226
})
4227-
createWorkspaceBuild(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4227+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
42284228
successfulJob: false,
42294229
createdAt: now.Add(-3 * time.Minute), // within lookback period - counted as failed job
42304230
})
4231-
createWorkspaceBuild(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4231+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
42324232
successfulJob: true,
42334233
createdAt: now.Add(-2 * time.Minute),
42344234
})
4235-
createWorkspaceBuild(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4235+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
42364236
successfulJob: true,
42374237
createdAt: now.Add(-1 * time.Minute),
42384238
})
@@ -4266,27 +4266,27 @@ func TestGetPresetsBackoff(t *testing.T) {
42664266
tmpl1V1 := createTmplVersion(t, db, tmpl1, tmpl1.ActiveVersionID, now, &tmplVersionOpts{
42674267
DesiredInstances: 6,
42684268
})
4269-
createWorkspaceBuild(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4269+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
42704270
successfulJob: false,
42714271
createdAt: now.Add(-lookbackPeriod - time.Minute), // earlier than lookback period - skipped
42724272
})
4273-
createWorkspaceBuild(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4273+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
42744274
successfulJob: false,
42754275
createdAt: now.Add(-4 * time.Minute),
42764276
})
4277-
createWorkspaceBuild(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4277+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
42784278
successfulJob: false,
42794279
createdAt: now.Add(-0 * time.Minute),
42804280
})
4281-
createWorkspaceBuild(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4281+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
42824282
successfulJob: false,
42834283
createdAt: now.Add(-3 * time.Minute),
42844284
})
4285-
createWorkspaceBuild(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4285+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
42864286
successfulJob: false,
42874287
createdAt: now.Add(-1 * time.Minute),
42884288
})
4289-
createWorkspaceBuild(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4289+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
42904290
successfulJob: false,
42914291
createdAt: now.Add(-2 * time.Minute),
42924292
})
@@ -4323,7 +4323,7 @@ func TestGetPresetsBackoff(t *testing.T) {
43234323
DesiredInstances: 1,
43244324
})
43254325

4326-
createWorkspaceBuild(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
4326+
createPrebuiltWorkspace(t, ctx, db, tmpl1, tmpl1V1, orgID, now, &workspaceBuildOpts{
43274327
successfulJob: false,
43284328
createdAt: now.Add(-lookbackPeriod - time.Minute), // earlier than lookback period - skipped
43294329
})

0 commit comments

Comments
 (0)
0