@@ -264,7 +264,7 @@ func Test_Runner(t *testing.T) {
264264// Wait for the workspace build job to be picked up.
265265checkJobStartedCtx := testutil .Context (t ,testutil .WaitLong )
266266jobCh := make (chan codersdk.ProvisionerJob ,1 )
267- require .Eventually (t ,func ()bool {
267+ testutil .Eventually (checkJobStartedCtx , t ,func (ctx context. Context )bool {
268268workspaces ,err := client .Workspaces (checkJobStartedCtx , codersdk.WorkspaceFilter {})
269269if err != nil {
270270return false
@@ -286,7 +286,7 @@ func Test_Runner(t *testing.T) {
286286}
287287jobCh <- ws .LatestBuild .Job
288288return true
289- },testutil .WaitLong , testutil . IntervalSlow )
289+ },testutil .IntervalSlow )
290290
291291t .Log ("canceling scaletest workspace creation" )
292292runnerCancel ()
@@ -308,9 +308,8 @@ func Test_Runner(t *testing.T) {
308308}()
309309
310310// Ensure the job has been marked as canceled
311- checkJobCanceledCtx := testutil .Context (t ,testutil .WaitLong )
312- require .Eventually (t ,func ()bool {
313- pj ,err := client .OrganizationProvisionerJob (checkJobCanceledCtx ,runningJob .OrganizationID ,runningJob .ID )
311+ testutil .Eventually (cleanupCtx ,t ,func (ctx context.Context )bool {
312+ pj ,err := client .OrganizationProvisionerJob (ctx ,runningJob .OrganizationID ,runningJob .ID )
314313if ! assert .NoError (t ,err ) {
315314return false
316315}
@@ -324,7 +323,7 @@ func Test_Runner(t *testing.T) {
324323}
325324
326325return true
327- },testutil .WaitLong , testutil . IntervalSlow )
326+ },testutil .IntervalSlow )
328327cleanupCancel ()
329328<- done
330329cleanupLogsStr := cleanupLogs .String ()