From 652a68715f4b78f7d157fc5ec58381dbaa2e9e11 Mon Sep 17 00:00:00 2001 From: Chris Arcand Date: Thu, 28 Oct 2021 01:33:18 -0500 Subject: [PATCH] cloud/e2e: Misc test fixes --- internal/cloud/e2e/backend_apply_before_init_test.go | 4 ++-- internal/cloud/e2e/migrate_state_tfc_to_tfc_test.go | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/internal/cloud/e2e/backend_apply_before_init_test.go b/internal/cloud/e2e/backend_apply_before_init_test.go index 213a48f0fa..702b79bbc3 100644 --- a/internal/cloud/e2e/backend_apply_before_init_test.go +++ b/internal/cloud/e2e/backend_apply_before_init_test.go @@ -30,7 +30,7 @@ func Test_backend_apply_before_init(t *testing.T) { commands: []tfCommand{ { command: []string{"apply"}, - expectedCmdOutput: `Terraform Cloud has been configured but needs to be initialized`, + expectedCmdOutput: `Terraform Cloud initialization required, please run "terraform init"`, expectError: true, }, }, @@ -66,7 +66,7 @@ func Test_backend_apply_before_init(t *testing.T) { commands: []tfCommand{ { command: []string{"apply"}, - expectedCmdOutput: `Terraform Cloud has been configured but needs to be initialized`, + expectedCmdOutput: `Terraform Cloud initialization required, please run "terraform init"`, expectError: true, }, }, diff --git a/internal/cloud/e2e/migrate_state_tfc_to_tfc_test.go b/internal/cloud/e2e/migrate_state_tfc_to_tfc_test.go index 3c48e6f3d7..6d086de5bb 100644 --- a/internal/cloud/e2e/migrate_state_tfc_to_tfc_test.go +++ b/internal/cloud/e2e/migrate_state_tfc_to_tfc_test.go @@ -5,7 +5,6 @@ package main import ( "context" - "fmt" "io/ioutil" "os" "testing" @@ -209,10 +208,6 @@ func Test_migrate_tfc_to_tfc_single_workspace(t *testing.T) { expectedCmdOutput: `The Terraform Cloud configuration only allows named workspaces!`, expectError: true, userInput: []string{"new-workspace", "yes"}, - postInputOutput: []string{ - // this is a temporary measure till we resolve some of the - // version mismatching. - fmt.Sprintf(`Remote workspace Terraform version "%s" does not match local Terraform version`, tfversion.String())}, }, }, },