From 7a1e56b707a0fe6d108f9d6030ad2a6de3173608 Mon Sep 17 00:00:00 2001 From: Ethan <39577870+ethanndickson@users.noreply.github.com> Date: Wed, 30 Apr 2025 15:18:13 +1000 Subject: [PATCH] test: avoid sharing `echo.Responses` across tests (#17610) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I missed this in https://github.com/coder/coder/pull/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 --- cli/restart_test.go | 2 +- cli/start_test.go | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/cli/restart_test.go b/cli/restart_test.go index 2179aea744..d69344435b 100644 --- a/cli/restart_test.go +++ b/cli/restart_test.go @@ -359,7 +359,7 @@ func TestRestartWithParameters(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) owner := coderdtest.CreateFirstUser(t, client) member, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID) - version := coderdtest.CreateTemplateVersion(t, client, owner.OrganizationID, mutableParamsResponse) + version := coderdtest.CreateTemplateVersion(t, client, owner.OrganizationID, mutableParamsResponse()) coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, owner.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, member, template.ID, func(cwr *codersdk.CreateWorkspaceRequest) { diff --git a/cli/start_test.go b/cli/start_test.go index 2e893bc20f..29fa4cdb46 100644 --- a/cli/start_test.go +++ b/cli/start_test.go @@ -33,8 +33,8 @@ const ( mutableParameterValue = "hello" ) -var ( - mutableParamsResponse = &echo.Responses{ +func mutableParamsResponse() *echo.Responses { + return &echo.Responses{ Parse: echo.ParseComplete, ProvisionPlan: []*proto.Response{ { @@ -54,8 +54,10 @@ var ( }, ProvisionApply: echo.ApplyComplete, } +} - immutableParamsResponse = &echo.Responses{ +func immutableParamsResponse() *echo.Responses { + return &echo.Responses{ Parse: echo.ParseComplete, ProvisionPlan: []*proto.Response{ { @@ -74,7 +76,7 @@ var ( }, ProvisionApply: echo.ApplyComplete, } -) +} func TestStart(t *testing.T) { t.Parallel() @@ -210,7 +212,7 @@ func TestStartWithParameters(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) owner := coderdtest.CreateFirstUser(t, client) member, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID) - version := coderdtest.CreateTemplateVersion(t, client, owner.OrganizationID, immutableParamsResponse) + version := coderdtest.CreateTemplateVersion(t, client, owner.OrganizationID, immutableParamsResponse()) coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, owner.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, member, template.ID, func(cwr *codersdk.CreateWorkspaceRequest) { @@ -262,7 +264,7 @@ func TestStartWithParameters(t *testing.T) { client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) owner := coderdtest.CreateFirstUser(t, client) member, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID) - version := coderdtest.CreateTemplateVersion(t, client, owner.OrganizationID, mutableParamsResponse) + version := coderdtest.CreateTemplateVersion(t, client, owner.OrganizationID, mutableParamsResponse()) coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID) template := coderdtest.CreateTemplate(t, client, owner.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, member, template.ID, func(cwr *codersdk.CreateWorkspaceRequest) {