Skip to content

Commit

Permalink
change global fail to return result
Browse files Browse the repository at this point in the history
  • Loading branch information
bearium committed Dec 11, 2019
1 parent 68c7686 commit 3afe32c
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions cmd/preflight/cli/stdout_results.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,17 @@ import (
analyzerunner "github.com/replicatedhq/troubleshoot/pkg/analyze"
)

var failed = false

func showStdoutResults(preflightName string, analyzeResults []*analyzerunner.AnalyzeResult) error {
fmt.Printf("\n=== TEST %s\n", preflightName)
for _, analyzeResult := range analyzeResults {
fmt.Printf("=== RUN: %s\n", analyzeResult.Title)
}
var failed bool
for _, analyzeResult := range analyzeResults {
outputResult(analyzeResult)
testResultfailed := outputResult(analyzeResult)
if testResultfailed {
failed = true
}
}
if failed {
fmt.Printf("--- FAIL %s\n", preflightName)
Expand All @@ -26,16 +28,17 @@ func showStdoutResults(preflightName string, analyzeResults []*analyzerunner.Ana
return nil
}

func outputResult(analyzeResult *analyzerunner.AnalyzeResult) {
func outputResult(analyzeResult *analyzerunner.AnalyzeResult) bool {
if analyzeResult.IsPass {
fmt.Printf(" --- PASS %s\n", analyzeResult.Title)
fmt.Printf(" --- %s\n", analyzeResult.Message)
} else if analyzeResult.IsWarn {
fmt.Printf(" --- WARN: %s\n", analyzeResult.Title)
fmt.Printf(" --- %s\n", analyzeResult.Message)
} else if analyzeResult.IsFail {
failed = true
fmt.Printf(" --- FAIL: %s\n", analyzeResult.Title)
fmt.Printf(" --- %s\n", analyzeResult.Message)
return true
}
return false
}

0 comments on commit 3afe32c

Please sign in to comment.