Skip to content

Commit b2c130f

Browse files
committed
fix: lifecycle executor prebuilds test
1 parent 8486f3f commit b2c130f

File tree

2 files changed

+29
-6
lines changed

2 files changed

+29
-6
lines changed

coderd/autobuild/lifecycle_executor_test.go

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1259,7 +1259,14 @@ func TestExecutorPrebuilds(t *testing.T) {
12591259
require.Equal(t, codersdk.BuildReasonInitiator, prebuild.LatestBuild.Reason)
12601260

12611261
// Given: a user claims the prebuilt workspace
1262-
dbWorkspace := dbgen.ClaimPrebuild(t, db, user.ID, "claimedWorkspace-autostop", preset.ID)
1262+
dbWorkspace := dbgen.ClaimPrebuild(
1263+
t, db,
1264+
user.ID,
1265+
"claimedWorkspace-autostop",
1266+
preset.ID,
1267+
sql.NullString{},
1268+
sql.NullTime{},
1269+
sql.NullInt64{})
12631270
workspace := coderdtest.MustWorkspace(t, client, dbWorkspace.ID)
12641271

12651272
// When: the autobuild executor ticks *after* the deadline:
@@ -1353,7 +1360,14 @@ func TestExecutorPrebuilds(t *testing.T) {
13531360
database.WorkspaceTransitionStart)
13541361

13551362
// Given: a user claims the prebuilt workspace
1356-
dbWorkspace := dbgen.ClaimPrebuild(t, db, user.ID, "claimedWorkspace-autostart", preset.ID)
1363+
dbWorkspace := dbgen.ClaimPrebuild(
1364+
t, db,
1365+
user.ID,
1366+
"claimedWorkspace-autostart",
1367+
preset.ID,
1368+
autostartSched,
1369+
sql.NullTime{},
1370+
sql.NullInt64{})
13571371
workspace := coderdtest.MustWorkspace(t, client, dbWorkspace.ID)
13581372

13591373
// Given: the prebuilt workspace goes to a stop status

coderd/database/dbgen/dbgen.go

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1436,14 +1436,23 @@ func UserSecret(t testing.TB, db database.Store, seed database.UserSecret) datab
14361436
return userSecret
14371437
}
14381438

1439-
func ClaimPrebuild(t testing.TB, db database.Store, newUserID uuid.UUID, newName string, presetID uuid.UUID) database.ClaimPrebuiltWorkspaceRow {
1439+
func ClaimPrebuild(
1440+
t testing.TB,
1441+
db database.Store,
1442+
newUserID uuid.UUID,
1443+
newName string,
1444+
presetID uuid.UUID,
1445+
autostartSchedule sql.NullString,
1446+
nextStartAt sql.NullTime,
1447+
ttl sql.NullInt64,
1448+
) database.ClaimPrebuiltWorkspaceRow {
14401449
claimedWorkspace, err := db.ClaimPrebuiltWorkspace(genCtx, database.ClaimPrebuiltWorkspaceParams{
14411450
NewUserID: newUserID,
14421451
NewName: newName,
14431452
PresetID: presetID,
1444-
AutostartSchedule: sql.NullString{},
1445-
NextStartAt: sql.NullTime{},
1446-
WorkspaceTtl: sql.NullInt64{},
1453+
AutostartSchedule: autostartSchedule,
1454+
NextStartAt: nextStartAt,
1455+
WorkspaceTtl: ttl,
14471456
})
14481457
require.NoError(t, err, "claim prebuilt workspace")
14491458

0 commit comments

Comments
 (0)