Skip to content

Commit 883c748

Browse files
cstyancstyan
committed
more cleanup of function params
Signed-off-by: Callum Styan <callumstyan@gmail.com>
1 parent e48c724 commit 883c748

File tree

3 files changed

+45
-45
lines changed

3 files changed

+45
-45
lines changed

‎coderd/autobuild/lifecycle_executor_test.go

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func TestExecutorAutostartOK(t *testing.T) {
6161
// When: the autobuild executor ticks after the scheduled time
6262
go func() {
6363
tickTime := sched.Next(workspace.LatestBuild.CreatedAt)
64-
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), tickTime)
64+
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, tickTime)
6565
tickCh <- tickTime
6666
close(tickCh)
6767
}()
@@ -122,7 +122,7 @@ func TestMultipleLifecycleExecutors(t *testing.T) {
122122
require.NoError(t, err)
123123
// Get both clients to perform a lifecycle execution tick
124124
next := sched.Next(workspace.LatestBuild.CreatedAt)
125-
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), next)
125+
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, next)
126126

127127
startCh := make(chan struct{})
128128
go func() {
@@ -261,7 +261,7 @@ func TestExecutorAutostartTemplateUpdated(t *testing.T) {
261261
// When: the autobuild executor ticks after the scheduled time
262262
go func() {
263263
tickTime := sched.Next(workspace.LatestBuild.CreatedAt)
264-
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), tickTime)
264+
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, tickTime)
265265
tickCh <- tickTime
266266
close(tickCh)
267267
}()
@@ -446,7 +446,7 @@ func TestExecutorAutostopOK(t *testing.T) {
446446
// When: the autobuild executor ticks *after* the deadline:
447447
go func() {
448448
tickTime := workspace.LatestBuild.Deadline.Time.Add(time.Minute)
449-
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), tickTime)
449+
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, tickTime)
450450
tickCh <- tickTime
451451
close(tickCh)
452452
}()
@@ -495,7 +495,7 @@ func TestExecutorAutostopExtend(t *testing.T) {
495495
// When: the autobuild executor ticks *after* the original deadline:
496496
go func() {
497497
tickTime := originalDeadline.Time.Add(time.Minute)
498-
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), tickTime)
498+
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, tickTime)
499499
tickCh <- tickTime
500500
}()
501501

@@ -507,7 +507,7 @@ func TestExecutorAutostopExtend(t *testing.T) {
507507
// When: the autobuild executor ticks after the *new* deadline:
508508
go func() {
509509
tickTime := newDeadline.Add(time.Minute)
510-
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), tickTime)
510+
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, tickTime)
511511
tickCh <- tickTime
512512
close(tickCh)
513513
}()
@@ -701,7 +701,7 @@ func TestExecuteAutostopSuspendedUser(t *testing.T) {
701701

702702
admin := coderdtest.CreateFirstUser(t, client)
703703
// Wait for provisioner to be available
704-
coderdtest.MustWaitForProvisionersWithClient(t, client)
704+
coderdtest.MustWaitForAnyProvisionerWithClient(t, client)
705705
version := coderdtest.CreateTemplateVersion(t, client, admin.OrganizationID, nil)
706706
coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
707707
template := coderdtest.CreateTemplate(t, client, admin.OrganizationID, version.ID)
@@ -808,7 +808,7 @@ func TestExecutorAutostartMultipleOK(t *testing.T) {
808808
// When: the autobuild executor ticks past the scheduled time
809809
go func() {
810810
tickTime := sched.Next(workspace.LatestBuild.CreatedAt)
811-
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), tickTime)
811+
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, tickTime)
812812
tickCh <- tickTime
813813
tickCh2 <- tickTime
814814
close(tickCh)
@@ -878,7 +878,7 @@ func TestExecutorAutostartWithParameters(t *testing.T) {
878878
// When: the autobuild executor ticks after the scheduled time
879879
go func() {
880880
tickTime := sched.Next(workspace.LatestBuild.CreatedAt)
881-
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), tickTime)
881+
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, tickTime)
882882
tickCh <- tickTime
883883
close(tickCh)
884884
}()
@@ -977,7 +977,7 @@ func TestExecutorAutostopTemplateDisabled(t *testing.T) {
977977
// When: the autobuild executor ticks after the workspace setting, but before the template setting:
978978
go func() {
979979
tickTime := workspace.LatestBuild.Job.CompletedAt.Add(45 * time.Minute)
980-
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), tickTime)
980+
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, tickTime)
981981
tickCh <- tickTime
982982
}()
983983

@@ -989,7 +989,7 @@ func TestExecutorAutostopTemplateDisabled(t *testing.T) {
989989
// When: the autobuild executor ticks after the template setting:
990990
go func() {
991991
tickTime := workspace.LatestBuild.Job.CompletedAt.Add(61 * time.Minute)
992-
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), tickTime)
992+
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, tickTime)
993993
tickCh <- tickTime
994994
close(tickCh)
995995
}()
@@ -1020,7 +1020,7 @@ func TestExecutorRequireActiveVersion(t *testing.T) {
10201020
})
10211021
)
10221022
// Wait for provisioner to be available
1023-
coderdtest.MustWaitForProvisioners(t, db)
1023+
coderdtest.MustWaitForAnyProvisioner(t, db)
10241024

10251025
ctx := testutil.Context(t, testutil.WaitShort)
10261026
owner := coderdtest.CreateFirstUser(t, ownerClient)
@@ -1063,7 +1063,7 @@ func TestExecutorRequireActiveVersion(t *testing.T) {
10631063
require.NoError(t, err)
10641064

10651065
tickTime := sched.Next(ws.LatestBuild.CreatedAt)
1066-
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), tickTime)
1066+
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, tickTime)
10671067
ticker <- tickTime
10681068
stats := <-statCh
10691069
require.Len(t, stats.Transitions, 1)
@@ -1227,7 +1227,7 @@ func TestNotifications(t *testing.T) {
12271227
// Wait for workspace to become dormant
12281228
notifyEnq.Clear()
12291229
tickTime := workspace.LastUsedAt.Add(timeTilDormant * 3)
1230-
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), tickTime)
1230+
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, tickTime)
12311231
ticker <- tickTime
12321232
_ = testutil.TryReceive(testutil.Context(t, testutil.WaitShort), t, statCh)
12331233

@@ -1308,7 +1308,7 @@ func TestExecutorPrebuilds(t *testing.T) {
13081308
// When: the autobuild executor ticks *after* the deadline:
13091309
go func() {
13101310
tickTime := prebuild.LatestBuild.Deadline.Time.Add(time.Minute)
1311-
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), tickTime)
1311+
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, tickTime)
13121312
tickCh <- tickTime
13131313
}()
13141314

@@ -1327,7 +1327,7 @@ func TestExecutorPrebuilds(t *testing.T) {
13271327
// When: the autobuild executor ticks *after* the deadline:
13281328
go func() {
13291329
tickTime := workspace.LatestBuild.Deadline.Time.Add(time.Minute)
1330-
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), tickTime)
1330+
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, tickTime)
13311331
tickCh <- tickTime
13321332
close(tickCh)
13331333
}()
@@ -1696,13 +1696,13 @@ func TestExecutorAutostartSkipsWhenNoProvisionersAvailable(t *testing.T) {
16961696
workspace = coderdtest.MustTransitionWorkspace(t, client, workspace.ID, codersdk.WorkspaceTransitionStart, codersdk.WorkspaceTransitionStop)
16971697

16981698
// Wait for provisioner to be available for this specific workspace
1699-
coderdtest.MustWaitForProvisionersAvailable(t, db, workspace, provisionerdserver.StaleInterval)
1699+
coderdtest.MustWaitForProvisionersAvailable(t, db, workspace)
17001700
p, err := coderdtest.GetProvisionerForTags(db, time.Now(), workspace.OrganizationID, provisionerDaemonTags)
17011701
require.NoError(t, err, "Error getting provisioner for workspace")
17021702

17031703
// Ensure the provisioner is stale
17041704
staleTime := sched.Next(workspace.LatestBuild.CreatedAt).Add((-1 * provisionerdserver.StaleInterval) + -10*time.Second)
1705-
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), staleTime)
1705+
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, staleTime)
17061706

17071707
// Trigger autobuild
17081708
tickCh <- sched.Next(workspace.LatestBuild.CreatedAt)
@@ -1715,7 +1715,7 @@ func TestExecutorAutostartSkipsWhenNoProvisionersAvailable(t *testing.T) {
17151715

17161716
// Ensure the provisioner is NOT stale, and see if we get a successful state transition.
17171717
notStaleTime := sched.Next(workspace.LatestBuild.CreatedAt).Add((-1 * provisionerdserver.StaleInterval) + 10*time.Second)
1718-
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), notStaleTime)
1718+
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, notStaleTime)
17191719

17201720
// Trigger autobuild
17211721
go func() {

‎coderd/coderdtest/coderdtest.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1631,10 +1631,10 @@ func ctxWithProvisionerPermissions(ctx context.Context) context.Context {
16311631

16321632
// UpdateProvisionerLastSeenAt updates the provisioner daemon's LastSeenAt timestamp
16331633
// to the specified time to prevent it from appearing stale during autobuild operations
1634-
func UpdateProvisionerLastSeenAt(t *testing.T, db database.Store, id uuid.UUID, prev, tickTime time.Time) {
1634+
func UpdateProvisionerLastSeenAt(t *testing.T, db database.Store, id uuid.UUID, tickTime time.Time) {
16351635
t.Helper()
16361636
ctx := ctxWithProvisionerPermissions(context.Background())
1637-
t.Logf("Updating provisioner %s LastSeenAt from %v to %v", id, prev, tickTime)
1637+
t.Logf("Updating provisioner %s LastSeenAt from %v to %v", id, tickTime)
16381638
err := db.UpdateProvisionerDaemonLastSeenAt(ctx, database.UpdateProvisionerDaemonLastSeenAtParams{
16391639
ID: id,
16401640
LastSeenAt: sql.NullTime{Time: tickTime, Valid: true},
@@ -1643,7 +1643,7 @@ func UpdateProvisionerLastSeenAt(t *testing.T, db database.Store, id uuid.UUID,
16431643
t.Logf("Successfully updated provisioner LastSeenAt")
16441644
}
16451645

1646-
func MustWaitForProvisioners(t *testing.T, db database.Store) {
1646+
func MustWaitForAnyProvisioner(t *testing.T, db database.Store) {
16471647
t.Helper()
16481648
ctx := ctxWithProvisionerPermissions(testutil.Context(t, testutil.WaitShort))
16491649
require.Eventually(t, func() bool {
@@ -1652,7 +1652,7 @@ func MustWaitForProvisioners(t *testing.T, db database.Store) {
16521652
}, testutil.WaitShort, testutil.IntervalFast)
16531653
}
16541654

1655-
func MustWaitForProvisionersWithClient(t *testing.T, client *codersdk.Client) {
1655+
func MustWaitForAnyProvisionerWithClient(t *testing.T, client *codersdk.Client) {
16561656
t.Helper()
16571657
ctx := ctxWithProvisionerPermissions(testutil.Context(t, testutil.WaitShort))
16581658
require.Eventually(t, func() bool {
@@ -1661,8 +1661,8 @@ func MustWaitForProvisionersWithClient(t *testing.T, client *codersdk.Client) {
16611661
}, testutil.WaitShort, testutil.IntervalFast)
16621662
}
16631663

1664-
// mustWaitForProvisionersAvailable waits for provisioners to be available for a specific workspace
1665-
func MustWaitForProvisionersAvailable(t *testing.T, db database.Store, workspace codersdk.Workspace, staleDuration time.Duration) uuid.UUID {
1664+
// MustWaitForProvisionersAvailable waits for provisioners to be available for a specific workspace.
1665+
func MustWaitForProvisionersAvailable(t *testing.T, db database.Store, workspace codersdk.Workspace) uuid.UUID {
16661666
t.Helper()
16671667
ctx := ctxWithProvisionerPermissions(testutil.Context(t, testutil.WaitShort))
16681668
id := uuid.UUID{}
@@ -1699,7 +1699,7 @@ func MustWaitForProvisionersAvailable(t *testing.T, db database.Store, workspace
16991699
for _, pd := range provisionerDaemons {
17001700
if pd.LastSeenAt.Valid {
17011701
age := now.Sub(pd.LastSeenAt.Time)
1702-
if age <= staleDuration {
1702+
if age <= provisionerdserver.StaleInterval {
17031703
id = pd.ID
17041704
return true // Found an active provisioner
17051705
}

‎enterprise/coderd/workspaces_test.go

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,7 @@ func TestWorkspaceAutobuild(t *testing.T) {
648648

649649
p, err := coderdtest.GetProvisionerForTags(db, time.Now(), ws.OrganizationID, nil)
650650
require.NoError(t, err)
651-
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), tickTime)
651+
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, tickTime)
652652
ticker <- tickTime
653653
stats := <-statCh
654654
// Expect workspace to transition to stopped state for breaching
@@ -700,7 +700,7 @@ func TestWorkspaceAutobuild(t *testing.T) {
700700

701701
p, err := coderdtest.GetProvisionerForTags(db, time.Now(), ws.OrganizationID, nil)
702702
require.NoError(t, err)
703-
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), tickTime)
703+
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, tickTime)
704704
ticker <- tickTime
705705
stats := <-statCh
706706
// Expect no transitions since not enough time has elapsed.
@@ -805,7 +805,7 @@ func TestWorkspaceAutobuild(t *testing.T) {
805805

806806
p, err := coderdtest.GetProvisionerForTags(db, time.Now(), workspace.OrganizationID, nil)
807807
require.NoError(t, err)
808-
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), tickTime)
808+
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, tickTime)
809809
ticker <- tickTime
810810
stats := <-statCh
811811

@@ -908,7 +908,7 @@ func TestWorkspaceAutobuild(t *testing.T) {
908908
tickTime := time.Now().Add(time.Hour)
909909
p, err := coderdtest.GetProvisionerForTags(db, time.Now(), workspaces[0].OrganizationID, nil)
910910
require.NoError(t, err)
911-
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), tickTime)
911+
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, tickTime)
912912
ticker <- tickTime
913913
stats := <-statCh
914914

@@ -1053,7 +1053,7 @@ func TestWorkspaceAutobuild(t *testing.T) {
10531053
tickTime := ws.LastUsedAt.Add(2 * inactiveTTL)
10541054
p, err := coderdtest.GetProvisionerForTags(db, time.Now(), ws.OrganizationID, nil)
10551055
require.NoError(t, err)
1056-
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), tickTime)
1056+
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, tickTime)
10571057
ticker <- tickTime
10581058
stats := <-statCh
10591059
// Expect no transitions since workspace is stopped.
@@ -1107,7 +1107,7 @@ func TestWorkspaceAutobuild(t *testing.T) {
11071107
tickTime := ws.LastUsedAt.Add(2 * transitionTTL)
11081108
p, err := coderdtest.GetProvisionerForTags(db, time.Now(), ws.OrganizationID, nil)
11091109
require.NoError(t, err)
1110-
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), tickTime)
1110+
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, tickTime)
11111111
ticker <- tickTime
11121112
stats := <-statCh
11131113
// Expect workspace to transition to stopped state for breaching
@@ -1124,7 +1124,7 @@ func TestWorkspaceAutobuild(t *testing.T) {
11241124

11251125
// Simulate the workspace being dormant beyond the threshold.
11261126
tickTime2 := ws.DormantAt.Add(2 * transitionTTL)
1127-
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), tickTime)
1127+
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, tickTime)
11281128
ticker <- tickTime2
11291129
stats = <-statCh
11301130
require.Len(t, stats.Transitions, 1)
@@ -1192,7 +1192,7 @@ func TestWorkspaceAutobuild(t *testing.T) {
11921192
tickTime := ws.DormantAt.Add(-dormantTTL * 2)
11931193
p, err := coderdtest.GetProvisionerForTags(db, time.Now(), ws.OrganizationID, nil)
11941194
require.NoError(t, err)
1195-
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), tickTime)
1195+
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, tickTime)
11961196
ticker <- tickTime
11971197
stats := <-statCh
11981198
// Expect no transitions since not enough time has elapsed.
@@ -1205,7 +1205,7 @@ func TestWorkspaceAutobuild(t *testing.T) {
12051205

12061206
// Simlute the workspace breaching the threshold.
12071207
tickTime2 := ws.DormantAt.Add(dormantTTL * 2)
1208-
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), tickTime2)
1208+
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, tickTime2)
12091209
ticker <- tickTime2
12101210
stats = <-statCh
12111211
require.Len(t, stats.Transitions, 1)
@@ -1257,7 +1257,7 @@ func TestWorkspaceAutobuild(t *testing.T) {
12571257
tickTime := sched.Next(ws.LatestBuild.CreatedAt)
12581258
p, err := coderdtest.GetProvisionerForTags(db, time.Now(), ws.OrganizationID, nil)
12591259
require.NoError(t, err)
1260-
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), tickTime)
1260+
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, tickTime)
12611261
tickCh <- tickTime
12621262
stats := <-statsCh
12631263
require.Len(t, stats.Errors, 0)
@@ -1279,7 +1279,7 @@ func TestWorkspaceAutobuild(t *testing.T) {
12791279

12801280
// We should see the workspace get stopped now.
12811281
tickTime2 := ws.LastUsedAt.Add(inactiveTTL * 2)
1282-
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), tickTime)
1282+
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, tickTime)
12831283
tickCh <- tickTime2
12841284
stats = <-statsCh
12851285
require.Len(t, stats.Errors, 0)
@@ -1381,15 +1381,15 @@ func TestWorkspaceAutobuild(t *testing.T) {
13811381
tickTime := build.Job.CompletedAt.Add(time.Hour)
13821382
p, err := coderdtest.GetProvisionerForTags(db, time.Now(), ws.OrganizationID, nil)
13831383
require.NoError(t, err)
1384-
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), tickTime)
1384+
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, tickTime)
13851385
ticker <- tickTime
13861386
stats := <-statCh
13871387
require.Len(t, stats.Transitions, 0)
13881388

13891389
// Simulate ticking a day after the workspace was last attempted to
13901390
// be deleted. This should result in an attempt.
13911391
tickTime2 := build.Job.CompletedAt.Add(time.Hour * 25)
1392-
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), tickTime2)
1392+
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, tickTime2)
13931393
ticker <- tickTime2
13941394
stats = <-statCh
13951395
require.Len(t, stats.Transitions, 1)
@@ -1453,7 +1453,7 @@ func TestWorkspaceAutobuild(t *testing.T) {
14531453
tickTime := sched.Next(ws.LatestBuild.CreatedAt)
14541454
p, err := coderdtest.GetProvisionerForTags(db, time.Now(), ws.OrganizationID, nil)
14551455
require.NoError(t, err)
1456-
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), tickTime)
1456+
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, tickTime)
14571457
tickCh <- tickTime
14581458
stats := <-statsCh
14591459
require.Len(t, stats.Errors, 0)
@@ -1483,7 +1483,7 @@ func TestWorkspaceAutobuild(t *testing.T) {
14831483

14841484
// Force an autostart transition again.
14851485
tickTime2 := sched.Next(firstBuild.CreatedAt)
1486-
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), tickTime)
1486+
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, tickTime)
14871487
tickCh <- tickTime2
14881488
stats = <-statsCh
14891489
require.Len(t, stats.Errors, 0)
@@ -1551,7 +1551,7 @@ func TestWorkspaceAutobuild(t *testing.T) {
15511551
clock.Set(next)
15521552
p, err := coderdtest.GetProvisionerForTags(db, time.Now(), ws.OrganizationID, nil)
15531553
require.NoError(t, err)
1554-
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), next)
1554+
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, next)
15551555
tickCh <- next
15561556
stats := <-statsCh
15571557
ws = coderdtest.MustWorkspace(t, client, ws.ID)
@@ -2266,15 +2266,15 @@ func TestExecutorPrebuilds(t *testing.T) {
22662266
require.True(t, workspace.NextStartAt.Equal(*prebuild.NextStartAt))
22672267

22682268
// Wait for provisioner to be registered
2269-
coderdtest.MustWaitForProvisioners(t, db)
2269+
coderdtest.MustWaitForAnyProvisioner(t, db)
22702270

22712271
// Wait for provisioner to be available for this specific workspace
2272-
coderdtest.MustWaitForProvisionersAvailable(t, db, prebuild, provisionerdserver.StaleInterval)
2272+
coderdtest.MustWaitForProvisionersAvailable(t, db, prebuild)
22732273

22742274
tickTime := sched.Next(prebuild.LatestBuild.CreatedAt).Add(time.Minute)
22752275
p, err := coderdtest.GetProvisionerForTags(db, time.Now(), workspace.OrganizationID, nil)
22762276
require.NoError(t, err)
2277-
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), tickTime)
2277+
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, tickTime)
22782278

22792279
// When: the autobuild executor ticks at the scheduled time
22802280
go func() {

0 commit comments

Comments
 (0)