Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 995b330

Browse files
ethanndicksonethanndickson
authored
test: avoid sharing deployment values between subtests (#19833)
Blink didn't figure out a CI failure on main was caused by a data race; fixing it. I've also updated the [blink prompt](https://gist.githubusercontent.com/ethanndickson/8dea9f1db3957ac1baf30ae8ce6f1a42/raw/060aea7fabb82bef0029a17dad9a5daee7940760/blink-flake-instructions.md). https://github.com/coder/coder/actions/runs/17737809615
1 parent cda8593 commit 995b330

File tree

4 files changed

+48
-40
lines changed

4 files changed

+48
-40
lines changed

‎cli/sharing_test.go

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,14 @@ import (
2121
func TestSharingShare(t *testing.T) {
2222
t.Parallel()
2323

24-
dv := coderdtest.DeploymentValues(t)
25-
dv.Experiments = []string{string(codersdk.ExperimentWorkspaceSharing)}
26-
2724
t.Run("ShareWithUsers_Simple", func(t *testing.T) {
2825
t.Parallel()
2926

3027
var (
3128
client, db = coderdtest.NewWithDatabase(t, &coderdtest.Options{
32-
DeploymentValues: dv,
29+
DeploymentValues: coderdtest.DeploymentValues(t, func(dv *codersdk.DeploymentValues) {
30+
dv.Experiments = []string{string(codersdk.ExperimentWorkspaceSharing)}
31+
}),
3332
})
3433
orgOwner = coderdtest.CreateFirstUser(t, client)
3534
workspaceOwnerClient, workspaceOwner = coderdtest.CreateAnotherUser(t, client, orgOwner.OrganizationID, rbac.ScopedRoleOrgAuditor(orgOwner.OrganizationID))
@@ -69,7 +68,9 @@ func TestSharingShare(t *testing.T) {
6968

7069
var (
7170
client, db = coderdtest.NewWithDatabase(t, &coderdtest.Options{
72-
DeploymentValues: dv,
71+
DeploymentValues: coderdtest.DeploymentValues(t, func(dv *codersdk.DeploymentValues) {
72+
dv.Experiments = []string{string(codersdk.ExperimentWorkspaceSharing)}
73+
}),
7374
})
7475
orgOwner = coderdtest.CreateFirstUser(t, client)
7576

@@ -124,7 +125,9 @@ func TestSharingShare(t *testing.T) {
124125

125126
var (
126127
client, db = coderdtest.NewWithDatabase(t, &coderdtest.Options{
127-
DeploymentValues: dv,
128+
DeploymentValues: coderdtest.DeploymentValues(t, func(dv *codersdk.DeploymentValues) {
129+
dv.Experiments = []string{string(codersdk.ExperimentWorkspaceSharing)}
130+
}),
128131
})
129132
orgOwner = coderdtest.CreateFirstUser(t, client)
130133
workspaceOwnerClient, workspaceOwner = coderdtest.CreateAnotherUser(t, client, orgOwner.OrganizationID, rbac.ScopedRoleOrgAuditor(orgOwner.OrganizationID))
@@ -171,15 +174,14 @@ func TestSharingShare(t *testing.T) {
171174
func TestSharingStatus(t *testing.T) {
172175
t.Parallel()
173176

174-
dv := coderdtest.DeploymentValues(t)
175-
dv.Experiments = []string{string(codersdk.ExperimentWorkspaceSharing)}
176-
177177
t.Run("ListSharedUsers", func(t *testing.T) {
178178
t.Parallel()
179179

180180
var (
181181
client, db = coderdtest.NewWithDatabase(t, &coderdtest.Options{
182-
DeploymentValues: dv,
182+
DeploymentValues: coderdtest.DeploymentValues(t, func(dv *codersdk.DeploymentValues) {
183+
dv.Experiments = []string{string(codersdk.ExperimentWorkspaceSharing)}
184+
}),
183185
})
184186
orgOwner = coderdtest.CreateFirstUser(t, client)
185187
workspaceOwnerClient, workspaceOwner = coderdtest.CreateAnotherUser(t, client, orgOwner.OrganizationID, rbac.ScopedRoleOrgAuditor(orgOwner.OrganizationID))
@@ -220,15 +222,14 @@ func TestSharingStatus(t *testing.T) {
220222
func TestSharingRemove(t *testing.T) {
221223
t.Parallel()
222224

223-
dv := coderdtest.DeploymentValues(t)
224-
dv.Experiments = []string{string(codersdk.ExperimentWorkspaceSharing)}
225-
226225
t.Run("RemoveSharedUser_Simple", func(t *testing.T) {
227226
t.Parallel()
228227

229228
var (
230229
client, db = coderdtest.NewWithDatabase(t, &coderdtest.Options{
231-
DeploymentValues: dv,
230+
DeploymentValues: coderdtest.DeploymentValues(t, func(dv *codersdk.DeploymentValues) {
231+
dv.Experiments = []string{string(codersdk.ExperimentWorkspaceSharing)}
232+
}),
232233
})
233234
orgOwner = coderdtest.CreateFirstUser(t, client)
234235
workspaceOwnerClient, workspaceOwner = coderdtest.CreateAnotherUser(t, client, orgOwner.OrganizationID, rbac.ScopedRoleOrgAuditor(orgOwner.OrganizationID))
@@ -287,7 +288,9 @@ func TestSharingRemove(t *testing.T) {
287288

288289
var (
289290
client, db = coderdtest.NewWithDatabase(t, &coderdtest.Options{
290-
DeploymentValues: dv,
291+
DeploymentValues: coderdtest.DeploymentValues(t, func(dv *codersdk.DeploymentValues) {
292+
dv.Experiments = []string{string(codersdk.ExperimentWorkspaceSharing)}
293+
}),
291294
})
292295
orgOwner = coderdtest.CreateFirstUser(t, client)
293296
workspaceOwnerClient, workspaceOwner = coderdtest.CreateAnotherUser(t, client, orgOwner.OrganizationID, rbac.ScopedRoleOrgAuditor(orgOwner.OrganizationID))

‎coderd/workspaces_test.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4917,15 +4917,14 @@ func TestUpdateWorkspaceACL(t *testing.T) {
49174917
func TestDeleteWorkspaceACL(t *testing.T) {
49184918
t.Parallel()
49194919

4920-
dv := coderdtest.DeploymentValues(t)
4921-
dv.Experiments = []string{string(codersdk.ExperimentWorkspaceSharing)}
4922-
49234920
t.Run("WorkspaceOwnerCanDelete", func(t *testing.T) {
49244921
t.Parallel()
49254922

49264923
var (
49274924
client, db = coderdtest.NewWithDatabase(t, &coderdtest.Options{
4928-
DeploymentValues: dv,
4925+
DeploymentValues: coderdtest.DeploymentValues(t, func(dv *codersdk.DeploymentValues) {
4926+
dv.Experiments = []string{string(codersdk.ExperimentWorkspaceSharing)}
4927+
}),
49294928
})
49304929
admin = coderdtest.CreateFirstUser(t, client)
49314930
workspaceOwnerClient, workspaceOwner = coderdtest.CreateAnotherUser(t, client, admin.OrganizationID)
@@ -4958,7 +4957,9 @@ func TestDeleteWorkspaceACL(t *testing.T) {
49584957

49594958
var (
49604959
client, db = coderdtest.NewWithDatabase(t, &coderdtest.Options{
4961-
DeploymentValues: dv,
4960+
DeploymentValues: coderdtest.DeploymentValues(t, func(dv *codersdk.DeploymentValues) {
4961+
dv.Experiments = []string{string(codersdk.ExperimentWorkspaceSharing)}
4962+
}),
49624963
})
49634964
admin = coderdtest.CreateFirstUser(t, client)
49644965
workspaceOwnerClient, workspaceOwner = coderdtest.CreateAnotherUser(t, client, admin.OrganizationID)

‎enterprise/cli/sharing_test.go

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,15 @@ import (
2626
func TestSharingShare(t *testing.T) {
2727
t.Parallel()
2828

29-
dv := coderdtest.DeploymentValues(t)
30-
dv.Experiments = []string{string(codersdk.ExperimentWorkspaceSharing)}
31-
3229
t.Run("ShareWithGroups_Simple", func(t *testing.T) {
3330
t.Parallel()
3431

3532
var (
3633
client, db, orgOwner = coderdenttest.NewWithDatabase(t, &coderdenttest.Options{
3734
Options: &coderdtest.Options{
38-
DeploymentValues: dv,
35+
DeploymentValues: coderdtest.DeploymentValues(t, func(dv *codersdk.DeploymentValues) {
36+
dv.Experiments = []string{string(codersdk.ExperimentWorkspaceSharing)}
37+
}),
3938
},
4039
LicenseOptions: &coderdenttest.LicenseOptions{
4140
Features: license.Features{
@@ -86,7 +85,9 @@ func TestSharingShare(t *testing.T) {
8685
var (
8786
client, db, orgOwner = coderdenttest.NewWithDatabase(t, &coderdenttest.Options{
8887
Options: &coderdtest.Options{
89-
DeploymentValues: dv,
88+
DeploymentValues: coderdtest.DeploymentValues(t, func(dv *codersdk.DeploymentValues) {
89+
dv.Experiments = []string{string(codersdk.ExperimentWorkspaceSharing)}
90+
}),
9091
},
9192
LicenseOptions: &coderdenttest.LicenseOptions{
9293
Features: license.Features{
@@ -140,7 +141,9 @@ func TestSharingShare(t *testing.T) {
140141
var (
141142
client, db, orgOwner = coderdenttest.NewWithDatabase(t, &coderdenttest.Options{
142143
Options: &coderdtest.Options{
143-
DeploymentValues: dv,
144+
DeploymentValues: coderdtest.DeploymentValues(t, func(dv *codersdk.DeploymentValues) {
145+
dv.Experiments = []string{string(codersdk.ExperimentWorkspaceSharing)}
146+
}),
144147
},
145148
LicenseOptions: &coderdenttest.LicenseOptions{
146149
Features: license.Features{
@@ -190,16 +193,15 @@ func TestSharingShare(t *testing.T) {
190193
func TestSharingStatus(t *testing.T) {
191194
t.Parallel()
192195

193-
dv := coderdtest.DeploymentValues(t)
194-
dv.Experiments = []string{string(codersdk.ExperimentWorkspaceSharing)}
195-
196196
t.Run("ListSharedUsers", func(t *testing.T) {
197197
t.Parallel()
198198

199199
var (
200200
client, db, orgOwner = coderdenttest.NewWithDatabase(t, &coderdenttest.Options{
201201
Options: &coderdtest.Options{
202-
DeploymentValues: dv,
202+
DeploymentValues: coderdtest.DeploymentValues(t, func(dv *codersdk.DeploymentValues) {
203+
dv.Experiments = []string{string(codersdk.ExperimentWorkspaceSharing)}
204+
}),
203205
},
204206
LicenseOptions: &coderdenttest.LicenseOptions{
205207
Features: license.Features{
@@ -248,16 +250,15 @@ func TestSharingStatus(t *testing.T) {
248250
func TestSharingRemove(t *testing.T) {
249251
t.Parallel()
250252

251-
dv := coderdtest.DeploymentValues(t)
252-
dv.Experiments = []string{string(codersdk.ExperimentWorkspaceSharing)}
253-
254253
t.Run("RemoveSharedGroup_Single", func(t *testing.T) {
255254
t.Parallel()
256255

257256
var (
258257
client, db, orgOwner = coderdenttest.NewWithDatabase(t, &coderdenttest.Options{
259258
Options: &coderdtest.Options{
260-
DeploymentValues: dv,
259+
DeploymentValues: coderdtest.DeploymentValues(t, func(dv *codersdk.DeploymentValues) {
260+
dv.Experiments = []string{string(codersdk.ExperimentWorkspaceSharing)}
261+
}),
261262
},
262263
LicenseOptions: &coderdenttest.LicenseOptions{
263264
Features: license.Features{
@@ -328,7 +329,9 @@ func TestSharingRemove(t *testing.T) {
328329
var (
329330
client, db, orgOwner = coderdenttest.NewWithDatabase(t, &coderdenttest.Options{
330331
Options: &coderdtest.Options{
331-
DeploymentValues: dv,
332+
DeploymentValues: coderdtest.DeploymentValues(t, func(dv *codersdk.DeploymentValues) {
333+
dv.Experiments = []string{string(codersdk.ExperimentWorkspaceSharing)}
334+
}),
332335
},
333336
LicenseOptions: &coderdenttest.LicenseOptions{
334337
Features: license.Features{

‎enterprise/coderd/workspaces_test.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4106,16 +4106,15 @@ func TestUpdateWorkspaceACL(t *testing.T) {
41064106
func TestDeleteWorkspaceACL(t *testing.T) {
41074107
t.Parallel()
41084108

4109-
dv := coderdtest.DeploymentValues(t)
4110-
dv.Experiments = []string{string(codersdk.ExperimentWorkspaceSharing)}
4111-
41124109
t.Run("WorkspaceOwnerCanDelete_Groups", func(t *testing.T) {
41134110
t.Parallel()
41144111

41154112
var (
41164113
client, db, admin = coderdenttest.NewWithDatabase(t, &coderdenttest.Options{
41174114
Options: &coderdtest.Options{
4118-
DeploymentValues: dv,
4115+
DeploymentValues: coderdtest.DeploymentValues(t, func(dv *codersdk.DeploymentValues) {
4116+
dv.Experiments = []string{string(codersdk.ExperimentWorkspaceSharing)}
4117+
}),
41194118
},
41204119
LicenseOptions: &coderdenttest.LicenseOptions{
41214120
Features: license.Features{
@@ -4157,7 +4156,9 @@ func TestDeleteWorkspaceACL(t *testing.T) {
41574156
var (
41584157
client, db, admin = coderdenttest.NewWithDatabase(t, &coderdenttest.Options{
41594158
Options: &coderdtest.Options{
4160-
DeploymentValues: dv,
4159+
DeploymentValues: coderdtest.DeploymentValues(t, func(dv *codersdk.DeploymentValues) {
4160+
dv.Experiments = []string{string(codersdk.ExperimentWorkspaceSharing)}
4161+
}),
41614162
},
41624163
LicenseOptions: &coderdenttest.LicenseOptions{
41634164
Features: license.Features{

0 commit comments

Comments
 (0)