From 1b8b67371c0cddc82d43c99a56ee20659345a4f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=ABl=20Stemmer?= <stemmertech@gmail.com>
Date: Thu, 3 Oct 2019 23:53:41 +0100
Subject: [PATCH] Report testsuite failures even if all tests succeeded

Fixes #87
---
 go-junit-report_test.go        | 29 +++++++++++++++++++++++++++++
 parser/parser.go               | 27 +++++++++++++++++----------
 testdata/32-failed-summary.txt |  5 +++++
 testdata/32-report.xml         | 12 ++++++++++++
 4 files changed, 63 insertions(+), 10 deletions(-)
 create mode 100644 testdata/32-failed-summary.txt
 create mode 100644 testdata/32-report.xml

diff --git a/go-junit-report_test.go b/go-junit-report_test.go
index 56e1a50..b92183d 100644
--- a/go-junit-report_test.go
+++ b/go-junit-report_test.go
@@ -1506,6 +1506,35 @@ var testCases = []TestCase{
 			},
 		},
 	},
+	{
+		name:       "32-failed-summary.txt",
+		reportName: "32-report.xml",
+		report: &parser.Report{
+			Packages: []parser.Package{
+				{
+					Name:     "github.com/jstemmer/test/failedsummary",
+					Duration: 5 * time.Millisecond,
+					Time:     5,
+					Tests: []*parser.Test{
+						{
+							Name:     "TestOne",
+							Duration: 0,
+							Time:     0,
+							Result:   parser.PASS,
+							Output:   []string{},
+						},
+						{
+							Name:     "Failure",
+							Duration: 0,
+							Time:     0,
+							Result:   parser.FAIL,
+							Output:   []string{"panic: panic"},
+						},
+					},
+				},
+			},
+		},
+	},
 }
 
 func TestParser(t *testing.T) {
diff --git a/parser/parser.go b/parser/parser.go
index 9a80050..e268128 100644
--- a/parser/parser.go
+++ b/parser/parser.go
@@ -91,9 +91,6 @@ func Parse(r io.Reader, pkgName string) (*Report, error) {
 	// current test
 	var cur string
 
-	// keep track if we've already seen a summary for the current test
-	var seenSummary bool
-
 	// coverage percentage report for current package
 	var coveragePct string
 
@@ -128,7 +125,6 @@ func Parse(r io.Reader, pkgName string) (*Report, error) {
 
 			// clear the current build package, so output lines won't be added to that build
 			capturedPackage = ""
-			seenSummary = false
 		} else if matches := regexBenchmark.FindStringSubmatch(line); len(matches) == 6 {
 			bytes, _ := strconv.Atoi(matches[4])
 			allocs, _ := strconv.Atoi(matches[5])
@@ -156,9 +152,10 @@ func Parse(r io.Reader, pkgName string) (*Report, error) {
 					Result: FAIL,
 					Output: packageCaptures[matches[2]],
 				})
-			} else if matches[1] == "FAIL" && len(tests) == 0 && len(buffers[cur]) > 0 {
-				// This package didn't have any tests, but it failed with some
-				// output. Create a dummy test with the output.
+			} else if matches[1] == "FAIL" && !containsFailures(tests) && len(buffers[cur]) > 0 {
+				// This package didn't have any failing tests, but still it
+				// failed with some output. Create a dummy test with the
+				// output.
 				tests = append(tests, &Test{
 					Name:   "Failure",
 					Result: FAIL,
@@ -237,9 +234,10 @@ func Parse(r io.Reader, pkgName string) (*Report, error) {
 			// current line is build failure capture for the current built package
 			packageCaptures[capturedPackage] = append(packageCaptures[capturedPackage], line)
 		} else if regexSummary.MatchString(line) {
-			// don't store any output after the summary
-			seenSummary = true
-		} else if !seenSummary {
+			// unset current test name so any additional output after the
+			// summary is captured separately.
+			cur = ""
+		} else {
 			// buffer anything else that we didn't recognize
 			buffers[cur] = append(buffers[cur], line)
 
@@ -296,6 +294,15 @@ func findTest(tests []*Test, name string) *Test {
 	return nil
 }
 
+func containsFailures(tests []*Test) bool {
+	for _, test := range tests {
+		if test.Result == FAIL {
+			return true
+		}
+	}
+	return false
+}
+
 // Failures counts the number of failed tests in this report
 func (r *Report) Failures() int {
 	count := 0
diff --git a/testdata/32-failed-summary.txt b/testdata/32-failed-summary.txt
new file mode 100644
index 0000000..d096396
--- /dev/null
+++ b/testdata/32-failed-summary.txt
@@ -0,0 +1,5 @@
+=== RUN   TestOne
+--- PASS: TestOne (0.00s)
+PASS
+panic: panic
+FAIL	github.com/jstemmer/test/failedsummary	0.005s
diff --git a/testdata/32-report.xml b/testdata/32-report.xml
new file mode 100644
index 0000000..f210a47
--- /dev/null
+++ b/testdata/32-report.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuites>
+	<testsuite tests="2" failures="1" time="0.005" name="github.com/jstemmer/test/failedsummary">
+		<properties>
+			<property name="go.version" value="1.0"></property>
+		</properties>
+		<testcase classname="failedsummary" name="TestOne" time="0.000"></testcase>
+		<testcase classname="failedsummary" name="Failure" time="0.000">
+			<failure message="Failed" type="">panic: panic</failure>
+		</testcase>
+	</testsuite>
+</testsuites>