Commit6f06f8d

authored

test: Fix test timeouts due to contexts created too early (#7242)

1 parentea78ca5 commit6f06f8dCopy full SHA for 6f06f8d

File tree

-3

lines changed

-3

lines changed

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -572,8 +572,7 @@ func TestWorkspaceBuildState(t *testing.T) {`
`572`	`572`
`573`	`573`	`funcTestWorkspaceBuildStatus(t*testing.T) {`
`574`	`574`	`t.Parallel()`
`575`		`-ctx,cancel:=context.WithTimeout(context.Background(),testutil.WaitLong)`
`576`		`-defercancel()`
	`575`	`+`
`577`	`576`	`auditor:=audit.NewMock()`
`578`	`577`	`numLogs:=len(auditor.AuditLogs())`
`579`	`578`	`client,closeDaemon,api:=coderdtest.NewWithAPI(t,&coderdtest.Options{IncludeProvisionerDaemon:true,Auditor:auditor})`
`@@ -597,6 +596,10 @@ func TestWorkspaceBuildStatus(t *testing.T) {`
`597`	`596`	`closeDaemon=coderdtest.NewProvisionerDaemon(t,api)`
`598`	`597`	`// after successful build is "running"`
`599`	`598`	`_=coderdtest.AwaitWorkspaceBuildJob(t,client,workspace.LatestBuild.ID)`
	`599`	`+`
	`600`	`+ctx,cancel:=context.WithTimeout(context.Background(),testutil.WaitLong)`
	`601`	`+defercancel()`
	`602`	`+`
`600`	`603`	`workspace,err:=client.Workspace(ctx,workspace.ID)`
`601`	`604`	`require.NoError(t,err)`
`602`	`605`	`require.EqualValues(t,codersdk.WorkspaceStatusRunning,workspace.LatestBuild.Status)`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -980,7 +980,6 @@ func TestReadFileWithTemplateUpdate(t *testing.T) {`
`980`	`980`	`t.Parallel()`
`981`	`981`	`t.Run("HasTemplateUpdate",func(t*testing.T) {`
`982`	`982`	`t.Parallel()`
`983`		`-ctx:=testutil.Context(t,testutil.WaitMedium)`
`984`	`983`
`985`	`984`	`// Upload a file`
`986`	`985`	`client:=coderdenttest.New(t,nil)`
`@@ -991,6 +990,8 @@ func TestReadFileWithTemplateUpdate(t *testing.T) {`
`991`	`990`	`},`
`992`	`991`	`})`
`993`	`992`
	`993`	`+ctx:=testutil.Context(t,testutil.WaitLong)`
	`994`	`+`
`994`	`995`	`resp,err:=client.Upload(ctx,codersdk.ContentTypeTar,bytes.NewReader(make([]byte,1024)))`
`995`	`996`	`require.NoError(t,err)`
`996`	`997`

Comments

(0)