cloud/e2e: Misc test fixes

This commit is contained in:
Chris Arcand 2021-10-28 01:33:18 -05:00
parent f881c2d794
commit 652a68715f
2 changed files with 2 additions and 7 deletions

View File

@ -30,7 +30,7 @@ func Test_backend_apply_before_init(t *testing.T) {
commands: []tfCommand{ commands: []tfCommand{
{ {
command: []string{"apply"}, 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, expectError: true,
}, },
}, },
@ -66,7 +66,7 @@ func Test_backend_apply_before_init(t *testing.T) {
commands: []tfCommand{ commands: []tfCommand{
{ {
command: []string{"apply"}, 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, expectError: true,
}, },
}, },

View File

@ -5,7 +5,6 @@ package main
import ( import (
"context" "context"
"fmt"
"io/ioutil" "io/ioutil"
"os" "os"
"testing" "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!`, expectedCmdOutput: `The Terraform Cloud configuration only allows named workspaces!`,
expectError: true, expectError: true,
userInput: []string{"new-workspace", "yes"}, 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())},
}, },
}, },
}, },