chore: add t.Parallel() to speed up tests (#184)

aslilac · web-flow · commit aa3dbcd5fe60 · 2025-02-24T10:13:31.000-07:00
This makes the test suite run in under a minute, compared to several
minutes per run before.
diff --git a/.golangci.yml b/.golangci.yml
@@ -18,9 +18,16 @@ linters:
     - makezero
     - misspell
     - nilerr
+    - paralleltest
     - predeclared
     - staticcheck
     - unconvert
     - unparam
     - unused
     - usetesting
+
+linters-settings:
+  paralleltest:
+    # Terraform acceptance subtests all share a Coder instance, and cannot run
+    # in parallel.
+    ignore-missing-subtests: true
diff --git a/Makefile b/Makefile
@@ -4,8 +4,8 @@ fmt:
 	go fmt ./...
 	terraform fmt -recursive
 
-vet:
-	go vet ./...
+lint:
+	golangci-lint run ./...
 
 gen:
 	go generate ./...
diff --git a/integration/integration_test.go b/integration/integration_test.go
@@ -22,6 +22,7 @@ import (
 // - Runs the `main.tf` specified in the given test directory against the Coder deployment
 // - Asserts the state of the deployment via `codersdk`.
 func TestIntegration(t *testing.T) {
+	t.Parallel()
 	if os.Getenv("TF_ACC") == "1" {
 		t.Skip("Skipping integration tests during tf acceptance tests")
 	}
@@ -145,6 +146,8 @@ func TestIntegration(t *testing.T) {
 		},
 	} {
 		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
+
 			client := StartCoder(ctx, t, tt.name, true)
 			wd, err := os.Getwd()
 			require.NoError(t, err)
diff --git a/internal/provider/group_data_source_test.go b/internal/provider/group_data_source_test.go
@@ -16,6 +16,7 @@ import (
 )
 
 func TestAccGroupDataSource(t *testing.T) {
+	t.Parallel()
 	if os.Getenv("TF_ACC") == "" {
 		t.Skip("Acceptance tests are disabled.")
 	}
diff --git a/internal/provider/group_resource_test.go b/internal/provider/group_resource_test.go
@@ -16,6 +16,7 @@ import (
 )
 
 func TestAccGroupResource(t *testing.T) {
+	t.Parallel()
 	if os.Getenv("TF_ACC") == "" {
 		t.Skip("Acceptance tests are disabled.")
 	}
@@ -133,6 +134,7 @@ func TestAccGroupResource(t *testing.T) {
 }
 
 func TestAccGroupResourceAGPL(t *testing.T) {
+	t.Parallel()
 	if os.Getenv("TF_ACC") == "" {
 		t.Skip("Acceptance tests are disabled.")
 	}
diff --git a/internal/provider/license_resource_test.go b/internal/provider/license_resource_test.go
@@ -13,6 +13,7 @@ import (
 )
 
 func TestAccLicenseResource(t *testing.T) {
+	t.Parallel()
 	if os.Getenv("TF_ACC") == "" {
 		t.Skip("Acceptance tests are disabled.")
 	}
diff --git a/internal/provider/organization_data_source_test.go b/internal/provider/organization_data_source_test.go
@@ -16,6 +16,7 @@ import (
 )
 
 func TestAccOrganizationDataSource(t *testing.T) {
+	t.Parallel()
 	if os.Getenv("TF_ACC") == "" {
 		t.Skip("Acceptance tests are disabled.")
 	}
diff --git a/internal/provider/organization_resource_test.go b/internal/provider/organization_resource_test.go
@@ -19,6 +19,7 @@ import (
 )
 
 func TestAccOrganizationResource(t *testing.T) {
+	t.Parallel()
 	if os.Getenv("TF_ACC") == "" {
 		t.Skip("Acceptance tests are disabled.")
 	}
diff --git a/internal/provider/organization_sync_settings_resource_test.go b/internal/provider/organization_sync_settings_resource_test.go
@@ -18,6 +18,7 @@ import (
 )
 
 func TestAccOrganizationSyncSettingsResource(t *testing.T) {
+	t.Parallel()
 	if os.Getenv("TF_ACC") == "" {
 		t.Skip("Acceptance tests are disabled.")
 	}
diff --git a/internal/provider/provider_test.go b/internal/provider/provider_test.go
@@ -16,6 +16,7 @@ var testAccProtoV6ProviderFactories = map[string]func() (tfprotov6.ProviderServe
 }
 
 func testAccPreCheck(t *testing.T) {
+	t.Helper()
 	// You can add code here to run prior to any test case execution, for example assertions
 	// about the appropriate environment variables being set are common to see in a pre-check
 	// function.
diff --git a/internal/provider/provisioner_key_resource_test.go b/internal/provider/provisioner_key_resource_test.go
@@ -18,6 +18,7 @@ import (
 )
 
 func TestAccProvisionerKeyResource(t *testing.T) {
+	t.Parallel()
 	if os.Getenv("TF_ACC") == "" {
 		t.Skip("Acceptance tests are disabled.")
 	}
diff --git a/internal/provider/template_data_source_test.go b/internal/provider/template_data_source_test.go
@@ -20,6 +20,7 @@ import (
 )
 
 func TestAccTemplateDataSource(t *testing.T) {
+	t.Parallel()
 	if os.Getenv("TF_ACC") == "" {
 		t.Skip("Acceptance tests are disabled.")
 	}
diff --git a/internal/provider/template_resource_test.go b/internal/provider/template_resource_test.go
@@ -23,6 +23,7 @@ import (
 )
 
 func TestAccTemplateResource(t *testing.T) {
+	t.Parallel()
 	if os.Getenv("TF_ACC") == "" {
 		t.Skip("Acceptance tests are disabled.")
 	}
@@ -637,6 +638,7 @@ func TestAccTemplateResource(t *testing.T) {
 }
 
 func TestAccTemplateResourceEnterprise(t *testing.T) {
+	t.Parallel()
 	if os.Getenv("TF_ACC") == "" {
 		t.Skip("Acceptance tests are disabled.")
 	}
@@ -782,6 +784,7 @@ func TestAccTemplateResourceEnterprise(t *testing.T) {
 }
 
 func TestAccTemplateResourceAGPL(t *testing.T) {
+	t.Parallel()
 	if os.Getenv("TF_ACC") == "" {
 		t.Skip("Acceptance tests are disabled.")
 	}
@@ -875,6 +878,7 @@ func TestAccTemplateResourceAGPL(t *testing.T) {
 }
 
 func TestAccTemplateResourceVariables(t *testing.T) {
+	t.Parallel()
 	cfg := `
 provider coderd {
 	url   = %q
@@ -1137,6 +1141,7 @@ func testAccCheckNumTemplateVersions(ctx context.Context, client *codersdk.Clien
 }
 
 func TestReconcileVersionIDs(t *testing.T) {
+	t.Parallel()
 	aUUID := uuid.New()
 	bUUID := uuid.New()
 	cases := []struct {
@@ -1507,6 +1512,8 @@ func TestReconcileVersionIDs(t *testing.T) {
 	for _, c := range cases {
 		c := c
 		t.Run(c.Name, func(t *testing.T) {
+			t.Parallel()
+
 			diag := c.planVersions.reconcileVersionIDs(c.inputState, c.configVersions, c.cfgHasActiveVersion)
 			if c.expectError {
 				require.True(t, diag.HasError())
diff --git a/internal/provider/user_data_source_test.go b/internal/provider/user_data_source_test.go
@@ -16,6 +16,7 @@ import (
 )
 
 func TestAccUserDataSource(t *testing.T) {
+	t.Parallel()
 	if os.Getenv("TF_ACC") == "" {
 		t.Skip("Acceptance tests are disabled.")
 	}
diff --git a/internal/provider/user_resource_test.go b/internal/provider/user_resource_test.go
@@ -14,6 +14,7 @@ import (
 )
 
 func TestAccUserResource(t *testing.T) {
+	t.Parallel()
 	if os.Getenv("TF_ACC") == "" {
 		t.Skip("Acceptance tests are disabled.")
 	}
diff --git a/internal/provider/uuid_internal_test.go b/internal/provider/uuid_internal_test.go
@@ -51,11 +51,10 @@ func TestUUIDTypeValueFromTerraform(t *testing.T) {
 		test := test
 		t.Run(test.name, func(t *testing.T) {
 			t.Parallel()
-			ctx := context.Background()
 
+			ctx := context.Background()
 			actual, err := uuidType.ValueFromTerraform(UUIDType, ctx, test.input)
 			require.NoError(t, err)
-
 			require.Equal(t, test.expected, actual)
 		})
 	}
@@ -86,10 +85,9 @@ func TestUUIDToStringValue(t *testing.T) {
 		name, test := name, test
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
-			ctx := context.Background()
 
+			ctx := context.Background()
 			s, _ := test.uuid.ToStringValue(ctx)
-
 			require.Equal(t, test.expected, s)
 		})
 	}
diff --git a/internal/provider/workspace_proxy_resource_test.go b/internal/provider/workspace_proxy_resource_test.go
@@ -15,6 +15,7 @@ import (
 )
 
 func TestAccWorkspaceProxyResource(t *testing.T) {
+	t.Parallel()
 	if os.Getenv("TF_ACC") == "" {
 		t.Skip("Acceptance tests are disabled.")
 	}
@@ -56,11 +57,12 @@ func TestAccWorkspaceProxyResource(t *testing.T) {
 }
 
 func TestAccWorkspaceProxyResourceAGPL(t *testing.T) {
+	t.Parallel()
 	if os.Getenv("TF_ACC") == "" {
 		t.Skip("Acceptance tests are disabled.")
 	}
 	ctx := context.Background()
-	client := integration.StartCoder(ctx, t, "ws_proxy_acc", false)
+	client := integration.StartCoder(ctx, t, "ws_proxy_acc_agpl", false)
 
 	cfg1 := testAccWorkspaceProxyResourceConfig{
 		URL:         client.URL.String(),

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ import (`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`func TestAccGroupDataSource(t *testing.T) {`
	`19`	`+ t.Parallel()`
`19`	`20`	`if os.Getenv("TF_ACC") == "" {`
`20`	`21`	`t.Skip("Acceptance tests are disabled.")`
`21`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ import (`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`func TestAccLicenseResource(t *testing.T) {`
	`16`	`+ t.Parallel()`
`16`	`17`	`if os.Getenv("TF_ACC") == "" {`
`17`	`18`	`t.Skip("Acceptance tests are disabled.")`
`18`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ import (`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`func TestAccOrganizationResource(t *testing.T) {`
	`22`	`+ t.Parallel()`
`22`	`23`	`if os.Getenv("TF_ACC") == "" {`
`23`	`24`	`t.Skip("Acceptance tests are disabled.")`
`24`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ import (`
`18`	`18`	`)`
`19`	`19`
`20`	`20`	`func TestAccOrganizationSyncSettingsResource(t *testing.T) {`
	`21`	`+ t.Parallel()`
`21`	`22`	`if os.Getenv("TF_ACC") == "" {`
`22`	`23`	`t.Skip("Acceptance tests are disabled.")`
`23`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ var testAccProtoV6ProviderFactories = map[string]func() (tfprotov6.ProviderServe`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`func testAccPreCheck(t *testing.T) {`
	`19`	`+ t.Helper()`
`19`	`20`	`// You can add code here to run prior to any test case execution, for example assertions`
`20`	`21`	`// about the appropriate environment variables being set are common to see in a pre-check`
`21`	`22`	`// function.`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ import (`
`20`	`20`	`)`
`21`	`21`
`22`	`22`	`func TestAccTemplateDataSource(t *testing.T) {`
	`23`	`+ t.Parallel()`
`23`	`24`	`if os.Getenv("TF_ACC") == "" {`
`24`	`25`	`t.Skip("Acceptance tests are disabled.")`
`25`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ import (`
`23`	`23`	`)`
`24`	`24`
`25`	`25`	`func TestAccTemplateResource(t *testing.T) {`
	`26`	`+ t.Parallel()`
`26`	`27`	`if os.Getenv("TF_ACC") == "" {`
`27`	`28`	`t.Skip("Acceptance tests are disabled.")`
`28`	`29`	`}`
`@@ -637,6 +638,7 @@ func TestAccTemplateResource(t *testing.T) {`
`637`	`638`	`}`
`638`	`639`
`639`	`640`	`func TestAccTemplateResourceEnterprise(t *testing.T) {`
	`641`	`+ t.Parallel()`
`640`	`642`	`if os.Getenv("TF_ACC") == "" {`
`641`	`643`	`t.Skip("Acceptance tests are disabled.")`
`642`	`644`	`}`
`@@ -782,6 +784,7 @@ func TestAccTemplateResourceEnterprise(t *testing.T) {`
`782`	`784`	`}`
`783`	`785`
`784`	`786`	`func TestAccTemplateResourceAGPL(t *testing.T) {`
	`787`	`+ t.Parallel()`
`785`	`788`	`if os.Getenv("TF_ACC") == "" {`
`786`	`789`	`t.Skip("Acceptance tests are disabled.")`
`787`	`790`	`}`
`@@ -875,6 +878,7 @@ func TestAccTemplateResourceAGPL(t *testing.T) {`
`875`	`878`	`}`
`876`	`879`
`877`	`880`	`func TestAccTemplateResourceVariables(t *testing.T) {`
	`881`	`+ t.Parallel()`
`878`	`882`	cfg := `
`879`	`883`	`provider coderd {`
`880`	`884`	`url = %q`
`@@ -1137,6 +1141,7 @@ func testAccCheckNumTemplateVersions(ctx context.Context, client *codersdk.Clien`
`1137`	`1141`	`}`
`1138`	`1142`
`1139`	`1143`	`func TestReconcileVersionIDs(t *testing.T) {`
	`1144`	`+ t.Parallel()`
`1140`	`1145`	`aUUID := uuid.New()`
`1141`	`1146`	`bUUID := uuid.New()`
`1142`	`1147`	`cases := []struct {`
`@@ -1507,6 +1512,8 @@ func TestReconcileVersionIDs(t *testing.T) {`
`1507`	`1512`	`for _, c := range cases {`
`1508`	`1513`	`c := c`
`1509`	`1514`	`t.Run(c.Name, func(t *testing.T) {`
	`1515`	`+ t.Parallel()`
	`1516`	`+`
`1510`	`1517`	`diag := c.planVersions.reconcileVersionIDs(c.inputState, c.configVersions, c.cfgHasActiveVersion)`
`1511`	`1518`	`if c.expectError {`
`1512`	`1519`	`require.True(t, diag.HasError())`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ import (`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`func TestAccUserResource(t *testing.T) {`
	`17`	`+ t.Parallel()`
`17`	`18`	`if os.Getenv("TF_ACC") == "" {`
`18`	`19`	`t.Skip("Acceptance tests are disabled.")`
`19`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ import (`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`func TestAccWorkspaceProxyResource(t *testing.T) {`
	`18`	`+ t.Parallel()`
`18`	`19`	`if os.Getenv("TF_ACC") == "" {`
`19`	`20`	`t.Skip("Acceptance tests are disabled.")`
`20`	`21`	`}`
`@@ -56,11 +57,12 @@ func TestAccWorkspaceProxyResource(t *testing.T) {`
`56`	`57`	`}`
`57`	`58`
`58`	`59`	`func TestAccWorkspaceProxyResourceAGPL(t *testing.T) {`
	`60`	`+ t.Parallel()`
`59`	`61`	`if os.Getenv("TF_ACC") == "" {`
`60`	`62`	`t.Skip("Acceptance tests are disabled.")`
`61`	`63`	`}`
`62`	`64`	`ctx := context.Background()`
`63`		`- client := integration.StartCoder(ctx, t, "ws_proxy_acc", false)`
	`65`	`+ client := integration.StartCoder(ctx, t, "ws_proxy_acc_agpl", false)`
`64`	`66`
`65`	`67`	`cfg1 := testAccWorkspaceProxyResourceConfig{`
`66`	`68`	`URL: client.URL.String(),`