From 506a968ade8dfb00b9208a7c5954fc2feb26afdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=ABl=20Stemmer?= <stemmertech@gmail.com>
Date: Mon, 7 Oct 2019 01:17:53 +0100
Subject: [PATCH] gtr: Handle failed summary when no tests failed

---
 pkg/gtr/builder.go | 49 +++++++++++++++++++++++++++++++---------------
 1 file changed, 33 insertions(+), 16 deletions(-)

diff --git a/pkg/gtr/builder.go b/pkg/gtr/builder.go
index b12c2b6..f8835ed 100644
--- a/pkg/gtr/builder.go
+++ b/pkg/gtr/builder.go
@@ -23,6 +23,7 @@ type ReportBuilder struct {
 	packageName string
 }
 
+// TODO: move gtr.FromEvents to ReportBuilder so we could have report builders for different parsers.
 func NewReportBuilder(packageName string) *ReportBuilder {
 	return &ReportBuilder{
 		tests:       make(map[int]Test),
@@ -97,6 +98,11 @@ func (b *ReportBuilder) CreateBuildError(packageName string) {
 }
 
 func (b *ReportBuilder) CreatePackage(name, result string, duration time.Duration, data string) {
+	pkg := Package{
+		Name:     name,
+		Duration: duration,
+	}
+
 	// Build errors are treated somewhat differently. Rather than having a
 	// single package with all build errors collected so far, we only care
 	// about the build errors for this particular package.
@@ -107,10 +113,9 @@ func (b *ReportBuilder) CreatePackage(name, result string, duration time.Duratio
 			}
 			buildErr.Duration = duration
 			buildErr.Cause = data
-			b.packages = append(b.packages, Package{
-				Name:       name,
-				BuildError: buildErr,
-			})
+			pkg.BuildError = buildErr
+			b.packages = append(b.packages, pkg)
+
 			delete(b.buildErrors, id)
 			// TODO: reset state
 			// TODO: buildErrors shouldn't reset/use nextId/lastId, they're more like a global cache
@@ -121,10 +126,6 @@ func (b *ReportBuilder) CreatePackage(name, result string, duration time.Duratio
 	// If we've collected output, but there were no tests or benchmarks then
 	// either there were no tests, or there was some other non-build error.
 	if len(b.output) > 0 && len(b.tests) == 0 && len(b.benchmarks) == 0 {
-		pkg := Package{
-			Name:     name,
-			Duration: duration,
-		}
 		if parseResult(result) == Fail {
 			pkg.RunError = Error{
 				Name:   name,
@@ -138,6 +139,16 @@ func (b *ReportBuilder) CreatePackage(name, result string, duration time.Duratio
 		return
 	}
 
+	// If the summary result says we failed, but there were no failing tests
+	// then something else must have failed.
+	if parseResult(result) == Fail && (len(b.tests) > 0 || len(b.benchmarks) > 0) && !b.containsFailingTest() {
+		pkg.RunError = Error{
+			Name:   name,
+			Output: b.output,
+		}
+		b.output = nil
+	}
+
 	// Collect tests and benchmarks for this package, maintaining insertion order.
 	var tests []Test
 	var benchmarks []Benchmark
@@ -150,14 +161,11 @@ func (b *ReportBuilder) CreatePackage(name, result string, duration time.Duratio
 		}
 	}
 
-	b.packages = append(b.packages, Package{
-		Name:       name,
-		Duration:   duration,
-		Coverage:   b.coverage,
-		Output:     b.output,
-		Tests:      tests,
-		Benchmarks: benchmarks,
-	})
+	pkg.Coverage = b.coverage
+	pkg.Output = b.output
+	pkg.Tests = tests
+	pkg.Benchmarks = benchmarks
+	b.packages = append(b.packages, pkg)
 
 	b.nextId = 1
 	b.lastId = 0
@@ -218,6 +226,15 @@ func (b *ReportBuilder) findBenchmark(name string) int {
 	return -1
 }
 
+func (b *ReportBuilder) containsFailingTest() bool {
+	for _, test := range b.tests {
+		if test.Result == Fail {
+			return true
+		}
+	}
+	return false
+}
+
 func parseResult(r string) Result {
 	switch r {
 	case "PASS":