Commit4eb2481

committed

Merge branch 'main' into githubteams

2 parents7d72da3 +bacfd63 commit4eb2481Copy full SHA for 4eb2481

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ test-postgres: test-clean test-postgres-docker`
`175`	`175`	`DB=ci DB_FROM=$(shell go run scripts/migrate-ci/main.go) gotestsum --junitfile="gotests.xml" --packages="./..." --\`
`176`	`176`	`-covermode=atomic -coverprofile="gotests.coverage" -timeout=30m\`
`177`	`177`	`-coverpkg=./...,github.com/coder/coder/codersdk\`
`178`		`--count=2 -race -failfast`
	`178`	`+-count=1 -race -failfast`
`179`	`179`	`.PHONY: test-postgres`
`180`	`180`
`181`	`181`	`test-postgres-docker:`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,9 @@ import (`
`14`	`14`
`15`	`15`	`funcTestNestedInTx(t*testing.T) {`
`16`	`16`	`t.Parallel()`
	`17`	`+iftesting.Short() {`
	`18`	`+t.SkipNow()`
	`19`	`+}`
`17`	`20`
`18`	`21`	`uid:=uuid.New()`
`19`	`22`	`sqlDB:=testSQLDB(t)`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -343,6 +343,9 @@ func TestWorkspaceByOwnerAndName(t *testing.T) {`
`343`	`343`	`// to run various filters against for testing.`
`344`	`344`	`funcTestWorkspaceFilter(t*testing.T) {`
`345`	`345`	`t.Parallel()`
	`346`	`+// Manual tests still occur below, so this is safe to disable.`
	`347`	`+t.Skip("This test is slow and flaky. See: https://github.com/coder/coder/issues/2854")`
	`348`	`+// nolint:unused`
`346`	`349`	`typecoderUserstruct {`
`347`	`350`	`*codersdk.Client`
`348`	`351`	`User codersdk.User`

Comments

(0)