Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 7b4ae29

Browse files
committed
make test pass
1 parent 6d47c04 commit 7b4ae29

File tree

1 file changed

+17
-14
lines changed

1 file changed

+17
-14
lines changed

coderd/autobuild/lifecycle_executor_test.go

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ import (
2626
"github.com/coder/coder/v2/provisioner/echo"
2727
"github.com/coder/coder/v2/provisionersdk/proto"
2828
"github.com/coder/coder/v2/testutil"
29-
30-
enterpriseSchedule "github.com/coder/coder/v2/enterprise/coderd/schedule"
3129
)
3230

3331
func TestExecutorAutostartOK(t *testing.T) {
@@ -1075,41 +1073,46 @@ func TestNotifications(t *testing.T) {
10751073
var (
10761074
ticker = make(chan time.Time)
10771075
statCh = make(chan autobuild.Stats)
1078-
logger = slogtest.Make(t, &slogtest.Options{})
10791076
notificationsEnqueuer = testutil.FakeNotificationsEnqueuer{}
1077+
timeTilDormant = time.Minute
10801078
client = coderdtest.New(t, &coderdtest.Options{
10811079
AutobuildTicker: ticker,
10821080
AutobuildStats: statCh,
10831081
IncludeProvisionerDaemon: true,
10841082
NotificationsEnqueuer: &notificationsEnqueuer,
1085-
TemplateScheduleStore: enterpriseSchedule.NewEnterpriseTemplateScheduleStore(userQuietHoursScheduleStore(), &notificationsEnqueuer, logger),
1083+
TemplateScheduleStore: schedule.MockTemplateScheduleStore{
1084+
GetFn: func(_ context.Context, _ database.Store, _ uuid.UUID) (schedule.TemplateScheduleOptions, error) {
1085+
return schedule.TemplateScheduleOptions{
1086+
UserAutostartEnabled: false,
1087+
UserAutostopEnabled: true,
1088+
DefaultTTL: 0,
1089+
AutostopRequirement: schedule.TemplateAutostopRequirement{},
1090+
TimeTilDormant: timeTilDormant,
1091+
}, nil
1092+
},
1093+
},
10861094
})
1087-
admin = coderdtest.CreateFirstUser(t, client)
1088-
version = coderdtest.CreateTemplateVersion(t, client, admin.OrganizationID, nil)
1089-
timeTilDormant = 1000
1095+
admin = coderdtest.CreateFirstUser(t, client)
1096+
version = coderdtest.CreateTemplateVersion(t, client, admin.OrganizationID, nil)
10901097
)
10911098

10921099
coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
1093-
template := coderdtest.CreateTemplate(t, client, admin.OrganizationID, version.ID, func(ctr *codersdk.CreateTemplateRequest) {
1094-
ctr.TimeTilDormantMillis = ptr.Ref(int64(timeTilDormant))
1095-
})
1100+
template := coderdtest.CreateTemplate(t, client, admin.OrganizationID, version.ID)
10961101
userClient, _ := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID)
10971102
workspace := coderdtest.CreateWorkspace(t, userClient, admin.OrganizationID, template.ID)
10981103
coderdtest.AwaitWorkspaceBuildJobCompleted(t, userClient, workspace.LatestBuild.ID)
10991104

11001105
// Stop workspace
11011106
workspace = coderdtest.MustTransitionWorkspace(t, client, workspace.ID, database.WorkspaceTransitionStart, database.WorkspaceTransitionStop)
1102-
build := coderdtest.AwaitWorkspaceBuildJobCompleted(t, userClient, workspace.LatestBuild.ID)
1107+
_ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, userClient, workspace.LatestBuild.ID)
11031108

11041109
// Wait for workspace to become dormant
1105-
ticker <- build.Job.CompletedAt.Add(time.Millisecond * time.Duration(timeTilDormant) * 2)
1110+
ticker <- workspace.LastUsedAt.Add(timeTilDormant * 3)
11061111
<-statCh
11071112

11081113
// Check that the workspace is dormant
11091114
workspace = coderdtest.MustWorkspace(t, client, workspace.ID)
11101115
require.NotNil(t, workspace.DormantAt)
1111-
1112-
// TODO: Write test to check notification.
11131116
})
11141117
}
11151118

0 commit comments

Comments
 (0)