Fix lint errors and test flakiness

mumoshu · Apr 25, 2020 · 73ac45d · 73ac45d
1 parent 8acc6a5
commit 73ac45d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 28 deletions.
diff --git a/examples/testing-with-expectations/example_test.variant b/examples/testing-with-expectations/example_test.variant
@@ -32,19 +32,7 @@ test "example" {
 
     err = <<EOS
 1 error occurred:
-	* unexpected exec 1: expected args [-c cd account && terraform init && (terraform workspace select client || terraform workspace new client], got [-c cd account && terraform init && (terraform workspace select wrongclient || terraform workspace new wrongclient)], diff:
-    []string{
-    	"-c",
-    	strings.Join({
-    		"cd account && terraform init && (terraform workspace select ",
-  + 		"wrong",
-    		"client || terraform workspace new ",
-  + 		"wrong",
-    		"client",
-  + 		")",
-    	}, ""),
-    }
-
+	* unexpected exec 1: expected args [-c cd account && terraform init && (terraform workspace select client || terraform workspace new client], got [-c cd account && terraform init && (terraform workspace select wrongclient || terraform workspace new wrongclient)]
 
     EOS
     exitstatus = 3

diff --git a/pkg/app/app.go b/pkg/app/app.go
@@ -3,8 +3,6 @@ package app
 import (
 	"flag"
 	"fmt"
-	"github.com/google/go-cmp/cmp"
-	"github.com/variantdev/vals"
 	"io/ioutil"
 	"os"
 	"os/exec"
@@ -16,6 +14,9 @@ import (
 	"testing"
 	"time"
 
+	"github.com/google/go-cmp/cmp"
+	"github.com/variantdev/vals"
+
 	"github.com/kr/text"
 
 	"github.com/zclconf/go-cty/cty/function"
@@ -277,14 +278,12 @@ func (app *App) execCmd(cmd Command, log bool) (*Result, error) {
 			return nil, fmt.Errorf("unexpected exec %d: expected command %q, got %q", app.execInvocationCount, expectation.Command, cmd.Name)
 		}
 
-		pad := strings.Repeat(" ", 2)
-
 		if diff := cmp.Diff(expectation.Args, cmd.Args); diff != "" {
-			return nil, fmt.Errorf("unexpected exec %d: expected args %v, got %v, diff:\n%s", app.execInvocationCount, expectation.Args, cmd.Args, pad+strings.Replace(diff, "\n", "\n"+pad, -1))
+			return nil, fmt.Errorf("unexpected exec %d: expected args %v, got %v", app.execInvocationCount, expectation.Args, cmd.Args)
 		}
 
 		if diff := cmp.Diff(expectation.Dir, cmd.Dir); diff != "" {
-			return nil, fmt.Errorf("unexpected exec %d: expected dir %q, got %q, diff:\n%s", app.execInvocationCount, expectation.Dir, cmd.Dir, pad+strings.Replace(diff, "\n", "\n"+pad, -1))
+			return nil, fmt.Errorf("unexpected exec %d: expected dir %q, got %q", app.execInvocationCount, expectation.Dir, cmd.Dir)
 		}
 
 		// Pop the successful command expectation so that on next execCmd call, we can
@@ -293,7 +292,7 @@ func (app *App) execCmd(cmd Command, log bool) (*Result, error) {
 
 		return &Result{Validated: true}, nil
 	} else if app.execInvocationCount > 0 {
-		return nil, fmt.Errorf("unexpected exec %d: fix the test by adding an expect block for this exec, or fix the test target: %v", app.execInvocationCount + 1, cmd)
+		return nil, fmt.Errorf("unexpected exec %d: fix the test by adding an expect block for this exec, or fix the test target: %v", app.execInvocationCount+1, cmd)
 	}
 
 	env := map[string]string{}
@@ -513,7 +512,7 @@ func (app *App) execAssert(ctx *hcl2.EvalContext, a Assert) error {
 			}
 		}
 
-		retErr := fmt.Errorf(`assertion %q failed: this expression must be true, but was false
+		msg := fmt.Sprintf(`
 
 EXPRESSION:
 
@@ -522,7 +521,9 @@ EXPRESSION:
 VARIABLES:
 
 %s
-`, a.Name, strings.TrimSpace(string(expr)), strings.Join(vars, "\n"))
+`, strings.TrimSpace(string(expr)), strings.Join(vars, "\n"))
+
+		retErr := fmt.Errorf(`assertion %q failed: this expression must be true, but was false%s`, a.Name, msg)
 
 		return retErr
 	}
@@ -747,18 +748,18 @@ func (app *App) execTestCase(t Test, c Case) (*Result, error) {
 }
 
 type Result struct {
-	Stdout     string
-	Stderr     string
-	Undefined  bool
-	Skipped    bool
-	ExitStatus int
-
+	Stdout    string
+	Stderr    string
+	Undefined bool
+	Skipped   bool
 	// Cancelled is set to true when and only when the original command execution has been scheduled concurrently,
 	// but was cancelled before it was actually executed.
 	Cancelled bool
 
 	// Validated is set to true when and only when the command execution was successfully validated against the mock
 	Validated bool
+
+	ExitStatus int
 }
 
 func (res *Result) toCty() cty.Value {