Add combined output if a test fails

commander-cli · Oct 24, 2019 · afb2d93 · afb2d93
1 parent 3fa13b0
commit afb2d93
Show file tree

Hide file tree

Showing 10 changed files with 179 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 commander
 !cmd/commander
 release
+dev.sh
 
 tmp.yml
 *.out

diff --git a/go.mod b/go.mod
@@ -1,7 +1,7 @@
 module github.com/SimonBaeumer/commander
 
 require (
-	github.com/SimonBaeumer/cmd v1.1.0
+	github.com/SimonBaeumer/cmd v1.2.1
 	github.com/antchfx/xmlquery v1.1.0
 	github.com/antchfx/xpath v1.1.0 // indirect
 	github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e

diff --git a/go.sum b/go.sum
@@ -1,5 +1,7 @@
 github.com/SimonBaeumer/cmd v1.1.0 h1:tr5dUMlly/8bLiC5B0J1AcE4ISru8POEfzAirWnUJnY=
 github.com/SimonBaeumer/cmd v1.1.0/go.mod h1:4mc/LDXDWNbkeooqHP83yx3JXtInPHjJkF8zhzqqmZE=
+github.com/SimonBaeumer/cmd v1.2.1 h1:NAhJp2ME68xZZJE4CVxOrNXStHdL77z1WF38OZFAQhM=
+github.com/SimonBaeumer/cmd v1.2.1/go.mod h1:4mc/LDXDWNbkeooqHP83yx3JXtInPHjJkF8zhzqqmZE=
 github.com/antchfx/jsonquery v1.0.0 h1:1Yhk496SrCoY6fJkFZqpXEqbwOw5sFtLns9la4NoK3I=
 github.com/antchfx/jsonquery v1.0.0/go.mod h1:h7950pvPrUZzJIflNqsELgDQovTpPNa0rAHf8NwjegY=
 github.com/antchfx/xmlquery v1.1.0 h1:vj0kZ1y3Q6my4AV+a9xbWrMYzubw+84zuiKgvfV8vb8=

diff --git a/pkg/output/cli.go b/pkg/output/cli.go
@@ -50,6 +50,7 @@ func (w *OutputWriter) Start(results <-chan runtime.TestResult) bool {
 			failed++
 			s := w.addTries("✗ "+r.TestCase.Title, r)
 			w.fprintf(au.Red(s))
+			w.fprintf(r.TestCase.Result.Combined)
 		}
 	}
 

diff --git a/pkg/runtime/runtime.go b/pkg/runtime/runtime.go
@@ -57,6 +57,7 @@ type CommandResult struct {
 	Status            ResultStatus
 	Stdout            string
 	Stderr            string
+	Combined          string
 	ExitCode          int
 	FailureProperties []string
 	Error             error
@@ -197,6 +198,7 @@ func runTest(test TestCase) TestResult {
 		ExitCode: cut.ExitCode(),
 		Stdout:   strings.TrimSpace(strings.Replace(cut.Stdout(), "\r\n", "\n", -1)),
 		Stderr:   strings.TrimSpace(strings.Replace(cut.Stderr(), "\r\n", "\n", -1)),
+		Combined: strings.TrimSpace(strings.Replace(cut.Combined(), "\r\n", "\n", -1)),
 	}
 
 	log.Println("title: '"+test.Title+"'", " ExitCode: ", test.Result.ExitCode)

diff --git a/vendor/github.com/SimonBaeumer/cmd/README.md b/vendor/github.com/SimonBaeumer/cmd/README.md
diff --git a/vendor/github.com/SimonBaeumer/cmd/command.go b/vendor/github.com/SimonBaeumer/cmd/command.go
diff --git a/vendor/github.com/SimonBaeumer/cmd/multiplexed_writer.go b/vendor/github.com/SimonBaeumer/cmd/multiplexed_writer.go
diff --git a/vendor/github.com/SimonBaeumer/cmd/testing_utils.go b/vendor/github.com/SimonBaeumer/cmd/testing_utils.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -1,4 +1,4 @@
-# github.com/SimonBaeumer/cmd v1.1.0
+# github.com/SimonBaeumer/cmd v1.2.1
 github.com/SimonBaeumer/cmd
 # github.com/antchfx/xmlquery v1.1.0
 github.com/antchfx/xmlquery