Skip to content

Commit e05d30b

Browse files
committed
couple bits
1 parent 3327cab commit e05d30b

File tree

5 files changed

+16
-6
lines changed

5 files changed

+16
-6
lines changed

.golangci.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,9 @@ linters:
2525
- unparam
2626
- unused
2727
- usetesting
28+
29+
linters-settings:
30+
paralleltest:
31+
# Terraform acceptance subtests all share a Coder instance, and cannot run
32+
# in parallel.
33+
ignore-missing-subtests: true

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ fmt:
44
go fmt ./...
55
terraform fmt -recursive
66

7-
vet:
8-
go vet ./...
7+
lint:
8+
golangci-lint run ./...
99

1010
gen:
1111
go generate ./...

integration/integration_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,8 @@ func TestIntegration(t *testing.T) {
146146
},
147147
} {
148148
t.Run(tt.name, func(t *testing.T) {
149+
t.Parallel()
150+
149151
client := StartCoder(ctx, t, tt.name, true)
150152
wd, err := os.Getwd()
151153
require.NoError(t, err)

internal/provider/template_resource_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1512,6 +1512,8 @@ func TestReconcileVersionIDs(t *testing.T) {
15121512
for _, c := range cases {
15131513
c := c
15141514
t.Run(c.Name, func(t *testing.T) {
1515+
t.Parallel()
1516+
15151517
diag := c.planVersions.reconcileVersionIDs(c.inputState, c.configVersions, c.cfgHasActiveVersion)
15161518
if c.expectError {
15171519
require.True(t, diag.HasError())

internal/provider/uuid_internal_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ func TestUUIDTypeValueFromTerraform(t *testing.T) {
5050
for _, test := range tests {
5151
test := test
5252
t.Run(test.name, func(t *testing.T) {
53-
ctx := context.Background()
53+
t.Parallel()
5454

55+
ctx := context.Background()
5556
actual, err := uuidType.ValueFromTerraform(UUIDType, ctx, test.input)
5657
require.NoError(t, err)
57-
5858
require.Equal(t, test.expected, actual)
5959
})
6060
}
@@ -84,10 +84,10 @@ func TestUUIDToStringValue(t *testing.T) {
8484
for name, test := range tests {
8585
name, test := name, test
8686
t.Run(name, func(t *testing.T) {
87-
ctx := context.Background()
87+
t.Parallel()
8888

89+
ctx := context.Background()
8990
s, _ := test.uuid.ToStringValue(ctx)
90-
9191
require.Equal(t, test.expected, s)
9292
})
9393
}

0 commit comments

Comments
 (0)