fixup! fixup! fixup! Simplify assertion type

cmoog · cmoog · commit 48418e51c1e3 · 2020-07-28T22:25:21.000-05:00
diff --git a/ci/tcli/tcli.go b/ci/tcli/tcli.go
@@ -174,41 +174,41 @@ func (r *ContainerRunner) RunCmd(cmd *exec.Cmd) *Assertable {
 // Assert runs the Assertable and
 func (a Assertable) Assert(t *testing.T, option ...Assertion) {
 	slog.Helper()
-	var cmdResult CommandResult
-
 	var (
 		stdout bytes.Buffer
 		stderr bytes.Buffer
+		result CommandResult
 	)
 
 	a.cmd.Stdout = &stdout
 	a.cmd.Stderr = &stderr
 
 	start := time.Now()
 	err := a.cmd.Run()
-	cmdResult.Duration = time.Since(start)
+	result.Duration = time.Since(start)
 
 	if exitErr, ok := err.(*exec.ExitError); ok {
-		cmdResult.ExitCode = exitErr.ExitCode()
+		result.ExitCode = exitErr.ExitCode()
 	} else if err != nil {
-		cmdResult.ExitCode = -1
+		// TODO: handle this case better
+		result.ExitCode = -1
 	} else {
-		cmdResult.ExitCode = 0
+		result.ExitCode = 0
 	}
 
-	cmdResult.Stdout = stdout.Bytes()
-	cmdResult.Stderr = stderr.Bytes()
+	result.Stdout = stdout.Bytes()
+	result.Stderr = stderr.Bytes()
 
 	slogtest.Info(t, "command output",
 		slog.F("command", a.cmd),
-		slog.F("stdout", string(cmdResult.Stdout)),
-		slog.F("stderr", string(cmdResult.Stderr)),
-		slog.F("exit-code", cmdResult.ExitCode),
-		slog.F("duration", cmdResult.Duration),
+		slog.F("stdout", string(result.Stdout)),
+		slog.F("stderr", string(result.Stderr)),
+		slog.F("exit_code", result.ExitCode),
+		slog.F("duration", result.Duration),
 	)
 
 	for _, assertion := range option {
-		assertion(t, &cmdResult)
+		assertion(t, &result)
 	}
 }
 
@@ -288,21 +288,18 @@ func StderrMatches(pattern string) Assertion {
 
 func matches(t *testing.T, name, pattern string, target []byte) {
 	slog.Helper()
+	fields := []slog.Field{
+		slog.F("pattern", pattern),
+		slog.F("target", string(target)),
+		slog.F("sink", name),
+	}
 
 	ok, err := regexp.Match(pattern, target)
 	if err != nil {
-		slogtest.Fatal(t, "failed to attempt regexp match", slog.Error(err),
-			slog.F("pattern", pattern),
-			slog.F("target", string(target)),
-			slog.F("sink", name),
-		)
+		slogtest.Fatal(t, "failed to attempt regexp match", append(fields, slog.Error(err))...)
 	}
 	if !ok {
-		slogtest.Fatal(t, "expected to find pattern, no match found",
-			slog.F("pattern", pattern),
-			slog.F("target", string(target)),
-			slog.F("sink", name),
-		)
+		slogtest.Fatal(t, "expected to find pattern, no match found", fields...)
 	}
 }
 
