do not print skipped TestResults as failure, add Skipped count to summary

Author: dylanhitt

pkg/output/cli.go

@@ -44,7 +44,7 @@ type TestResult struct {
 	FailedProperty string
 	Diff           string
 	Error          error
-	Skip           bool
+	Skipped        bool
 }
 
 // GetEventHandler create a new runtime.EventHandler
@@ -91,7 +91,7 @@ func (w *OutputWriter) printResult(r TestResult) {
 }
 
 func (w *OutputWriter) printSkip(r TestResult) {
-	w.fprintf(fmt.Sprintf("- [skipped] %s: was skipped", r.Title))
+	w.fprintf(fmt.Sprintf("- [skipped] %s", r.Title))
 }
 
 func (w *OutputWriter) printFailures(results []runtime.TestResult) {
@@ -106,7 +106,7 @@ func (w *OutputWriter) printFailures(results []runtime.TestResult) {
 			w.fprintf(r.Error.Error())
 			continue
 		}
-		if !r.Success {
+		if !r.Success && !r.Skipped {
 			w.fprintf(w.au.Bold(w.au.Red(w.template.failures(r))))
 			w.fprintf(r.Diff)
 		}
@@ -130,7 +130,7 @@ func convertTestResult(tr runtime.TestResult) TestResult {
 		FailedProperty: tr.FailedProperty,
 		Diff:           tr.ValidationResult.Diff,
 		Error:          tr.TestCase.Result.Error,
-		Skip:           tr.Skipped,
+		Skipped:        tr.Skipped,
 	}
 
 	return testResult

pkg/output/cli_template.go

@@ -40,7 +40,7 @@ var commanderTmpl = `
 
 // Summary
 {{define "summary" -}}
-	Count: {{len .TestResults}}, Failed: {{ .Failed }}
+	Count: {{len .TestResults}}, Failed: {{ .Failed }}, Skipped: {{ .Skipped }}
 {{- end -}}
 
 // Result

pkg/output/cli_test.go

@@ -30,14 +30,28 @@ func Test_EventHandlerTestFinished(t *testing.T) {
 
 	for _, tr := range testResults {
 		eh.TestFinished(tr)
-
 	}
 
 	output := buf.String()
-
 	assert.Contains(t, output, "✗ [192.168.0.1] Failed test")
 	assert.Contains(t, output, "✓ [docker-host] Successful test")
+}
+
+func Test_EventHandlerTestSkipped(t *testing.T) {
+	var buf bytes.Buffer
+	writer := NewCliOutput(true)
+	writer.out = &buf
+	eh := writer.GetEventHandler()
+
+	testResults := createFakeTestResults()
 
+	for _, tr := range testResults {
+		if tr.Skipped {
+			eh.TestSkipped(tr)
+		}
+	}
+	output := buf.String()
+	assert.Contains(t, output, "- [skipped] Skipped test")
 }
 
 func Test_PrintSummary(t *testing.T) {
@@ -98,5 +112,15 @@ func createFakeTestResults() []runtime.TestResult {
 		Tries: 2,
 	}
 
-	return []runtime.TestResult{tr, tr2, tr3}
+	tr4 := runtime.TestResult{
+		TestCase: runtime.TestCase{
+			Title:   "Skipped test",
+			Command: runtime.CommandUnderTest{},
+		},
+		FailedProperty: "Stdout",
+		Node:           "192.168.0.1",
+		Skipped:        true,
+	}
+
+	return []runtime.TestResult{tr, tr2, tr3, tr4}
 }

pkg/runtime/runner.go

@@ -31,7 +31,6 @@ func (r *Runner) Run(tests []TestCase) <-chan TestResult {
 		defer wg.Done()
 
 		for t := range tests {
-			// If test is disabled skip it
 			if t.Skip {
 				tr := TestResult{TestCase: t, Skipped: true}
 				out <- tr

pkg/runtime/runtime.go

@@ -141,12 +141,11 @@ func (r *Runtime) Start(tests []TestCase) Result {
 			continue
 		}
 
-		r.EventHandler.TestFinished(tr)
-
 		if !tr.ValidationResult.Success {
 			result.Failed++
 		}
 
+		r.EventHandler.TestFinished(tr)
 		result.TestResults = append(result.TestResults, tr)
 	}
 	result.Duration = time.Since(start)