Merge branch 'main' into githubteams

kylecarbs · kylecarbs · commit 4eb24816ca0b · 2022-07-08T18:04:25.000Z
diff --git a/Makefile b/Makefile
@@ -175,7 +175,7 @@ test-postgres: test-clean test-postgres-docker
 	DB=ci DB_FROM=$(shell go run scripts/migrate-ci/main.go) gotestsum --junitfile="gotests.xml" --packages="./..." -- \
 		-covermode=atomic -coverprofile="gotests.coverage" -timeout=30m \
 		-coverpkg=./...,github.com/coder/coder/codersdk \
-		-count=2 -race -failfast
+		-count=1 -race -failfast
 .PHONY: test-postgres
 
 test-postgres-docker:
diff --git a/coderd/database/db_test.go b/coderd/database/db_test.go
@@ -14,6 +14,9 @@ import (
 
 func TestNestedInTx(t *testing.T) {
 	t.Parallel()
+	if testing.Short() {
+		t.SkipNow()
+	}
 
 	uid := uuid.New()
 	sqlDB := testSQLDB(t)
diff --git a/coderd/workspaces_test.go b/coderd/workspaces_test.go
@@ -343,6 +343,9 @@ func TestWorkspaceByOwnerAndName(t *testing.T) {
 // to run various filters against for testing.
 func TestWorkspaceFilter(t *testing.T) {
 	t.Parallel()
+	// Manual tests still occur below, so this is safe to disable.
+	t.Skip("This test is slow and flaky. See: https://github.com/coder/coder/issues/2854")
+	// nolint:unused
 	type coderUser struct {
 		*codersdk.Client
 		User codersdk.User
