Commit5e88289

authored

chore(enterprise/coderd): conditionally disable parallelism on windows (#16072)

1 parentf4994ca commit5e88289Copy full SHA for 5e88289

File tree

-2

lines changed

-2

lines changed

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ import (`
`6`	`6`	`"database/sql"`
`7`	`7`	`"fmt"`
`8`	`8`	`"net/http"`
	`9`	`+"runtime"`
`9`	`10`	`"sync/atomic"`
`10`	`11`	`"testing"`
`11`	`12`	`"time"`
`@@ -1398,8 +1399,12 @@ func TestTemplateDoesNotAllowUserAutostop(t *testing.T) {`
`1398`	`1399`	`// real Terraform provisioner and validate that the workspace is created`
`1399`	`1400`	`// successfully. The workspace itself does not specify any resources, and`
`1400`	`1401`	`// this is fine.`
	`1402`	`+// nolint:paralleltest // this test tends to time out on windows runners`
	`1403`	`+// when run in parallel`
`1401`	`1404`	`funcTestWorkspaceTagsTerraform(t*testing.T) {`
`1402`		`-t.Parallel()`
	`1405`	`+ifruntime.GOOS!="windows" {`
	`1406`	`+t.Parallel()`
	`1407`	`+}`
`1403`	`1408`
`1404`	`1409`	mainTfTemplate:=`
`1405`	`1410`	`terraform {`
`@@ -1528,7 +1533,9 @@ func TestWorkspaceTagsTerraform(t *testing.T) {`
`1528`	`1533`	`} {`
`1529`	`1534`	`tc:=tc`
`1530`	`1535`	`t.Run(tc.name,func(t*testing.T) {`
`1531`		`-t.Parallel()`
	`1536`	`+ifruntime.GOOS!="windows" {`
	`1537`	`+t.Parallel()`
	`1538`	`+}`
`1532`	`1539`	`ctx:=testutil.Context(t,testutil.WaitSuperLong)`
`1533`	`1540`
`1534`	`1541`	`client,owner:=coderdenttest.New(t,&coderdenttest.Options{`

Comments

(0)