Skip to content

Commit c2eec18

Browse files
committed
Parallelize tests
1 parent 84e3ab9 commit c2eec18

File tree

6 files changed

+18
-40
lines changed

6 files changed

+18
-40
lines changed

coderd/authz/authz_test.go

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ import (
1212
var nilSet = authztest.Set{nil}
1313

1414
func Test_ExhaustiveAuthorize(t *testing.T) {
15+
t.Parallel()
16+
1517
all := authztest.GroupedPermissions(authztest.AllPermissions())
1618
roleVariants := permissionVariants(all)
1719
res := authz.ResourceType(authztest.PermObjectType).AsID(authztest.PermObjectID)

coderd/authz/authztest/iterator_test.go

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ import (
1111
)
1212

1313
func TestUnion(t *testing.T) {
14+
t.Parallel()
15+
1416
for i := 0; i < 100; i++ {
1517
allPerms := make(authztest.Set, 0)
1618
// 2 - 4 sets

coderd/authz/authztest/level_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ import (
99
)
1010

1111
func Test_GroupedPermissions(t *testing.T) {
12+
t.Parallel()
13+
1214
set := make(authztest.Set, 0)
1315
var total int
1416
for _, lvl := range authz.PermissionLevels {
@@ -86,5 +88,4 @@ func Test_GroupedPermissions(t *testing.T) {
8688
require.Equal(t, c.ExpAbs, len(c.Lvl.Abstain()), "correct num abs")
8789
})
8890
}
89-
9091
}

coderd/authz/authztest/permissions_test.go

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ import (
88
)
99

1010
func Test_AllPermissions(t *testing.T) {
11+
t.Parallel()
12+
1113
// If this changes, then we might have to fix some other tests. This constant
1214
// is the basis for understanding the permutation counts.
1315
const totalUniquePermissions int = 270

coderd/authz/authztest/set_test.go

+8
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@ import (
1010
)
1111

1212
func Test_Set(t *testing.T) {
13+
t.Parallel()
14+
1315
t.Run("Simple", func(t *testing.T) {
16+
t.Parallel()
17+
1418
for i := 0; i < 10; i++ {
1519
set := RandomSet(i)
1620
require.Equal(t, i, len(set), "set size")
@@ -23,6 +27,8 @@ func Test_Set(t *testing.T) {
2327
})
2428

2529
t.Run("NilPerms", func(t *testing.T) {
30+
t.Parallel()
31+
2632
for i := 0; i < 100; i++ {
2733
set := RandomSet(i)
2834
// Set some nils
@@ -38,6 +44,8 @@ func Test_Set(t *testing.T) {
3844
})
3945

4046
t.Run("String", func(t *testing.T) {
47+
t.Parallel()
48+
4149
set := authztest.Set{
4250
&authz.Permission{
4351
Sign: true,

coderd/authz/permission_test.go

+2-39
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ import (
44
"testing"
55

66
"github.com/coder/coder/coderd/authz"
7-
crand "github.com/coder/coder/cryptorand"
87
"github.com/stretchr/testify/require"
98
)
109

1110
func Test_PermissionString(t *testing.T) {
11+
t.Parallel()
12+
1213
testCases := []struct {
1314
Name string
1415
Permission authz.Permission
@@ -59,41 +60,3 @@ func Test_PermissionString(t *testing.T) {
5960
}
6061

6162
}
62-
63-
func BenchmarkPermissionString(b *testing.B) {
64-
total := 10000
65-
if b.N < total {
66-
total = b.N
67-
}
68-
perms := make([]authz.Permission, b.N)
69-
for n := 0; n < total; n++ {
70-
perms[n] = RandomPermission()
71-
}
72-
73-
b.ResetTimer()
74-
for n := 0; n < b.N; n++ {
75-
var _ = perms[n%total].String()
76-
}
77-
}
78-
79-
var resourceTypes = []authz.ResourceType{
80-
"project", "config", "user", "user_role",
81-
"workspace", "dev-url", "metric", "*",
82-
}
83-
84-
var actions = []authz.Action{
85-
"read", "create", "delete", "modify", "*",
86-
}
87-
88-
func RandomPermission() authz.Permission {
89-
n, _ := crand.Intn(len(authz.PermissionLevels))
90-
m, _ := crand.Intn(len(resourceTypes))
91-
a, _ := crand.Intn(len(actions))
92-
return authz.Permission{
93-
Sign: n%2 == 0,
94-
Level: authz.PermissionLevels[n],
95-
ResourceType: resourceTypes[m],
96-
ResourceID: "*",
97-
Action: actions[a],
98-
}
99-
}

0 commit comments

Comments
 (0)