From 5007397e333b6b7243f20cde825ebe64395d0155 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=ABl=20Stemmer?= <stemmertech@gmail.com>
Date: Mon, 7 Oct 2019 00:24:42 +0100
Subject: [PATCH] gtr: Reset active test when encountering a status line

This is to ensure that we don't append output lines that follow after a
status line to the last active test.
---
 pkg/gtr/builder.go | 4 ++++
 pkg/gtr/gtr.go     | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkg/gtr/builder.go b/pkg/gtr/builder.go
index a083ad8..b12c2b6 100644
--- a/pkg/gtr/builder.go
+++ b/pkg/gtr/builder.go
@@ -76,6 +76,10 @@ func (b *ReportBuilder) EndTest(name, result string, duration time.Duration) {
 	b.tests[id] = t
 }
 
+func (b *ReportBuilder) End() {
+	b.lastId = 0
+}
+
 func (b *ReportBuilder) Benchmark(name string, iterations int64, nsPerOp, mbPerSec float64, bytesPerOp, allocsPerOp int64) {
 	b.benchmarks[b.newId()] = Benchmark{
 		Name:        name,
diff --git a/pkg/gtr/gtr.go b/pkg/gtr/gtr.go
index 19f75e4..7d3d8f2 100644
--- a/pkg/gtr/gtr.go
+++ b/pkg/gtr/gtr.go
@@ -84,7 +84,8 @@ func FromEvents(events []Event, packageName string) Report {
 			report.EndTest(ev.Name, ev.Result, ev.Duration)
 		case "benchmark":
 			report.Benchmark(ev.Name, ev.Iterations, ev.NsPerOp, ev.MBPerSec, ev.BytesPerOp, ev.AllocsPerOp)
-		case "status": // ignore for now
+		case "status":
+			report.End()
 		case "summary":
 			report.CreatePackage(ev.Name, ev.Result, ev.Duration, ev.Data)
 		case "coverage":
@@ -198,6 +199,7 @@ func JUnit(report Report) junit.Testsuites {
 func formatOutput(output []string) string {
 	var lines []string
 	for _, line := range output {
+		// TODO: should this change depending on subtest level?
 		line = strings.TrimPrefix(line, "    ")
 		line = strings.TrimPrefix(line, "\t")
 		lines = append(lines, line)