Skip to content

Commit 7a1e56b

Browse files
test: avoid sharing echo.Responses across tests (#17610)
I missed this in #17211 because I only searched for `:= &echo.Responses` and not `= &echo.Responses` 🤦 Fixes flakes like https://github.com/coder/coder/actions/runs/14746732612/job/41395403979
1 parent 53ba361 commit 7a1e56b

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

cli/restart_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ func TestRestartWithParameters(t *testing.T) {
359359
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
360360
owner := coderdtest.CreateFirstUser(t, client)
361361
member, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)
362-
version := coderdtest.CreateTemplateVersion(t, client, owner.OrganizationID, mutableParamsResponse)
362+
version := coderdtest.CreateTemplateVersion(t, client, owner.OrganizationID, mutableParamsResponse())
363363
coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
364364
template := coderdtest.CreateTemplate(t, client, owner.OrganizationID, version.ID)
365365
workspace := coderdtest.CreateWorkspace(t, member, template.ID, func(cwr *codersdk.CreateWorkspaceRequest) {

cli/start_test.go

+8-6
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ const (
3333
mutableParameterValue = "hello"
3434
)
3535

36-
var (
37-
mutableParamsResponse = &echo.Responses{
36+
func mutableParamsResponse() *echo.Responses {
37+
return &echo.Responses{
3838
Parse: echo.ParseComplete,
3939
ProvisionPlan: []*proto.Response{
4040
{
@@ -54,8 +54,10 @@ var (
5454
},
5555
ProvisionApply: echo.ApplyComplete,
5656
}
57+
}
5758

58-
immutableParamsResponse = &echo.Responses{
59+
func immutableParamsResponse() *echo.Responses {
60+
return &echo.Responses{
5961
Parse: echo.ParseComplete,
6062
ProvisionPlan: []*proto.Response{
6163
{
@@ -74,7 +76,7 @@ var (
7476
},
7577
ProvisionApply: echo.ApplyComplete,
7678
}
77-
)
79+
}
7880

7981
func TestStart(t *testing.T) {
8082
t.Parallel()
@@ -210,7 +212,7 @@ func TestStartWithParameters(t *testing.T) {
210212
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
211213
owner := coderdtest.CreateFirstUser(t, client)
212214
member, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)
213-
version := coderdtest.CreateTemplateVersion(t, client, owner.OrganizationID, immutableParamsResponse)
215+
version := coderdtest.CreateTemplateVersion(t, client, owner.OrganizationID, immutableParamsResponse())
214216
coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
215217
template := coderdtest.CreateTemplate(t, client, owner.OrganizationID, version.ID)
216218
workspace := coderdtest.CreateWorkspace(t, member, template.ID, func(cwr *codersdk.CreateWorkspaceRequest) {
@@ -262,7 +264,7 @@ func TestStartWithParameters(t *testing.T) {
262264
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
263265
owner := coderdtest.CreateFirstUser(t, client)
264266
member, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)
265-
version := coderdtest.CreateTemplateVersion(t, client, owner.OrganizationID, mutableParamsResponse)
267+
version := coderdtest.CreateTemplateVersion(t, client, owner.OrganizationID, mutableParamsResponse())
266268
coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
267269
template := coderdtest.CreateTemplate(t, client, owner.OrganizationID, version.ID)
268270
workspace := coderdtest.CreateWorkspace(t, member, template.ID, func(cwr *codersdk.CreateWorkspaceRequest) {

0 commit comments

Comments
 (0)