Skip to content

Commit 01f4239

Browse files
committed
fix dbfake
1 parent 7990ce1 commit 01f4239

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

coderd/database/dbfake/dbfake.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3482,12 +3482,17 @@ func (q *fakeQuerier) GetWorkspacesEligibleForTransition(ctx context.Context, no
34823482
return nil, err
34833483
}
34843484

3485-
if build.Transition == database.WorkspaceTransitionStart && !build.Deadline.IsZero() && build.Deadline.Before(now) {
3485+
if build.Transition == database.WorkspaceTransitionStart &&
3486+
!build.Deadline.IsZero() &&
3487+
build.Deadline.Before(now) &&
3488+
!workspace.LockedAt.Valid {
34863489
workspaces = append(workspaces, workspace)
34873490
continue
34883491
}
34893492

3490-
if build.Transition == database.WorkspaceTransitionStop && workspace.AutostartSchedule.Valid {
3493+
if build.Transition == database.WorkspaceTransitionStop &&
3494+
workspace.AutostartSchedule.Valid &&
3495+
!workspace.LockedAt.Valid {
34913496
workspaces = append(workspaces, workspace)
34923497
continue
34933498
}
@@ -4701,6 +4706,7 @@ func (q *fakeQuerier) UpdateTemplateScheduleByID(_ context.Context, arg database
47014706
tpl.MaxTTL = arg.MaxTTL
47024707
tpl.FailureTTL = arg.FailureTTL
47034708
tpl.InactivityTTL = arg.InactivityTTL
4709+
tpl.LockedTTL = arg.LockedTTL
47044710
q.templates[idx] = tpl
47054711
return tpl.DeepCopy(), nil
47064712
}

enterprise/coderd/workspaces_test.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -444,11 +444,7 @@ func TestWorkspaceAutobuild(t *testing.T) {
444444
})
445445
)
446446
user := coderdtest.CreateFirstUser(t, client)
447-
_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
448-
Features: license.Features{
449-
codersdk.FeatureAdvancedTemplateScheduling: 1,
450-
},
451-
})
447+
_ = coderdenttest.AddFullLicense(t, client)
452448

453449
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
454450
Parse: echo.ParseComplete,

0 commit comments

Comments
 (0)