fix: tests

terramate-io · Jan 7, 2022 · 2306be5 · 2306be5
1 parent 41693e2
commit 2306be5
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 51 deletions.
diff --git a/cmd/terramate/cli/cli_order_test.go b/cmd/terramate/cli/cli_order_test.go
@@ -12,9 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// FIXME(katcipis): improve CLI tests isolation
-//go:build ignore
-
 package cli_test
 
 import (

diff --git a/cmd/terramate/cli/cli_run_test.go b/cmd/terramate/cli/cli_run_test.go
@@ -12,9 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// FIXME(katcipis): improve CLI tests isolation
-//go:build ignore
-
 package cli_test
 
 import (
@@ -409,44 +406,32 @@ func TestRunOrderNotChangedStackIgnored(t *testing.T) {
 	assertRunResult(t, cli.run("stacks", "list", "--changed"), runExpected{Stdout: wantList})
 
 	cat := test.LookPath(t, "cat")
-	wantRun := fmt.Sprintf(
-		"Running on changed stacks:\n[%s] running %s %s\n%s\n",
-		stack.RelPath(),
-		cat,
-		mainTfFileName,
-		mainTfContents,
-	)
+	wantRun := mainTfContents
 
 	assertRunResult(t, cli.run(
 		"run",
 		"--changed",
 		cat,
 		mainTfFileName,
-	), runExpected{Stdout: wantRun})
+	), runExpected{Stdout: wantRun, IgnoreStderr: true})
 
-	wantRun = fmt.Sprintf(
-		"Running on changed stacks:\n[%s] running %s %s\n%s\n",
-		".",
-		cat,
-		mainTfFileName,
-		mainTfContents,
-	)
+	wantRun = mainTfContents
 
 	cli = newCLI(t, stack.Path())
 	assertRunResult(t, cli.run(
 		"run",
 		"--changed",
 		cat,
 		mainTfFileName,
-	), runExpected{Stdout: wantRun})
+	), runExpected{Stdout: wantRun, IgnoreStderr: true})
 
 	cli = newCLI(t, stack2.Path())
 	assertRunResult(t, cli.run(
 		"run",
 		"--changed",
 		cat,
 		mainTfFileName,
-	), runExpected{Stdout: "Running on changed stacks:\n"})
+	), runExpected{Stdout: "", IgnoreStderr: true})
 }
 
 func TestRunOrderAllChangedStacksExecuted(t *testing.T) {
@@ -486,14 +471,8 @@ func TestRunOrderAllChangedStacksExecuted(t *testing.T) {
 
 	cat := test.LookPath(t, "cat")
 	wantRun := fmt.Sprintf(
-		"Running on changed stacks:\n[%s] running %s %s\n%s\n[%s] running %s %s\n%s\n",
-		stack2.RelPath(),
-		cat,
-		mainTfFileName,
+		"%s%s",
 		mainTfContents,
-		stack.RelPath(),
-		cat,
-		mainTfFileName,
 		mainTfContents,
 	)
 
@@ -502,5 +481,5 @@ func TestRunOrderAllChangedStacksExecuted(t *testing.T) {
 		"--changed",
 		cat,
 		mainTfFileName,
-	), runExpected{Stdout: wantRun})
+	), runExpected{Stdout: wantRun, IgnoreStderr: true})
 }
diff --git a/cmd/terramate/cli/cli_stacks_init_test.go b/cmd/terramate/cli/cli_stacks_init_test.go
@@ -12,9 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// FIXME(katcipis): improve CLI tests isolation
-//go:build ignore
-
 package cli_test
 
 import (

diff --git a/cmd/terramate/cli/cli_stacks_list_test.go b/cmd/terramate/cli/cli_stacks_list_test.go
@@ -12,9 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// FIXME(katcipis): improve CLI tests isolation
-//go:build ignore
-
 package cli_test
 
 import (

diff --git a/cmd/terramate/cli/cli_test.go b/cmd/terramate/cli/cli_test.go
@@ -12,9 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// FIXME(katcipis): improve CLI tests isolation
-//go:build ignore
-
 package cli_test
 
 import (
@@ -157,20 +154,14 @@ func TestListAndRunChangedStack(t *testing.T) {
 	assertRunResult(t, cli.run("stacks", "list", "--changed"), runExpected{Stdout: wantList})
 
 	cat := test.LookPath(t, "cat")
-	wantRun := fmt.Sprintf(
-		"Running on changed stacks:\n[%s] running %s %s\n%s\n",
-		stack.RelPath(),
-		cat,
-		mainTfFileName,
-		mainTfContents,
-	)
+	wantRun := mainTfContents
 
 	assertRunResult(t, cli.run(
 		"run",
 		"--changed",
 		cat,
 		mainTfFileName,
-	), runExpected{Stdout: wantRun})
+	), runExpected{Stdout: wantRun, IgnoreStderr: true})
 }
 
 func TestListAndRunChangedStackInAbsolutePath(t *testing.T) {

diff --git a/cmd/terramate/cli/stacks_globals_test.go b/cmd/terramate/cli/stacks_globals_test.go
@@ -12,9 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// FIXME(katcipis): improve CLI tests isolation
-//go:build ignore
-
 package cli_test
 
 import (