From 817a23b10d4e63da375125bf1886df7e1f85a0d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Stemmer?= Date: Sun, 27 Feb 2022 22:08:50 +0000 Subject: [PATCH] gtr: Handle end_test events without corresponding run_test event When running `go test` without the `-v` flag, the output may not contain everything that we expect. For example, no output is generated for passing tests. Even for a failing test the output does not contain a `=== RUN` line. Currently, this resulted in us ignoring the test result since we couldn't find an existing test to assign this result to. We should however handle this situation gracefully, and just assume a test exists when only encountering a test result line. References #109 --- pkg/gtr/builder.go | 15 ++++++++++----- pkg/gtr/gtr.go | 13 +++++++++---- testdata/13-report.xml | 14 +++++++------- testdata/14-report.xml | 10 +++++----- testdata/31-report.xml | 14 +++++++------- testdata/32-report.xml | 6 +++--- 6 files changed, 41 insertions(+), 31 deletions(-) diff --git a/pkg/gtr/builder.go b/pkg/gtr/builder.go index 3f657aa..bdf6a00 100644 --- a/pkg/gtr/builder.go +++ b/pkg/gtr/builder.go @@ -68,14 +68,19 @@ func (b *ReportBuilder) ContinueTest(name string) { } func (b *ReportBuilder) EndTest(name, result string, duration time.Duration, level int) { - id := b.findTest(name) - b.lastId = id + b.lastId = b.findTest(name) + if b.lastId < 0 { + // test did not exist, create one + // TODO: Likely reason is that the user ran go test without the -v + // flag, should we report this somewhere? + b.CreateTest(name) + } - t := b.tests[id] + t := b.tests[b.lastId] t.Result = parseResult(result) t.Duration = duration t.Level = level - b.tests[id] = t + b.tests[b.lastId] = t } func (b *ReportBuilder) End() { @@ -229,7 +234,7 @@ func (b *ReportBuilder) findBenchmark(name string) int { func (b *ReportBuilder) containsFailingTest() bool { for _, test := range b.tests { - if test.Result == Fail { + if test.Result == Fail || test.Result == Unknown { return true } } diff --git a/pkg/gtr/gtr.go b/pkg/gtr/gtr.go index ccc381b..5e5fde7 100644 --- a/pkg/gtr/gtr.go +++ b/pkg/gtr/gtr.go @@ -143,6 +143,11 @@ func JUnit(report Report, hostname string, now time.Time) junit.Testsuites { tc.Skipped = &junit.Result{ Message: formatOutput(test.Output, test.Level), } + } else if test.Result == Unknown { + tc.Error = &junit.Result{ + Message: "No test result found", + Data: formatOutput(test.Output, test.Level), + } } suite.AddTestcase(tc) @@ -172,8 +177,8 @@ func JUnit(report Report, hostname string, now time.Time) junit.Testsuites { Classname: pkg.BuildError.Name, Name: pkg.BuildError.Cause, Time: junit.FormatDuration(0), - Failure: &junit.Result{ - Message: "Failed", + Error: &junit.Result{ + Message: "Build error", Data: strings.Join(pkg.BuildError.Output, "\n"), }, } @@ -185,8 +190,8 @@ func JUnit(report Report, hostname string, now time.Time) junit.Testsuites { Classname: pkg.RunError.Name, Name: "Failure", Time: junit.FormatDuration(0), - Failure: &junit.Result{ - Message: "Failed", + Error: &junit.Result{ + Message: "Run error", Data: strings.Join(pkg.RunError.Output, "\n"), }, } diff --git a/testdata/13-report.xml b/testdata/13-report.xml index e3cea8d..a183850 100644 --- a/testdata/13-report.xml +++ b/testdata/13-report.xml @@ -1,5 +1,5 @@ - + @@ -12,28 +12,28 @@ - + - failing1/failing_test.go:15: undefined: x + failing1/failing_test.go:15: undefined: x - + - failing2/another_failing_test.go:20: undefined: y + failing2/another_failing_test.go:20: undefined: y - + - setupfailing1/failing_test.go:4: cannot find package "other/package" in any of: /path/vendor (vendor tree) /path/go/root (from $GOROOT) /path/go/path (from $GOPATH) + setupfailing1/failing_test.go:4: cannot find package "other/package" in any of: /path/vendor (vendor tree) /path/go/root (from $GOROOT) /path/go/path (from $GOPATH) diff --git a/testdata/14-report.xml b/testdata/14-report.xml index c7d691e..57cce23 100644 --- a/testdata/14-report.xml +++ b/testdata/14-report.xml @@ -1,19 +1,19 @@ - - + + - panic: init stacktrace + panic: init stacktrace - + - panic: init stacktrace + panic: init stacktrace diff --git a/testdata/31-report.xml b/testdata/31-report.xml index e3cea8d..a183850 100644 --- a/testdata/31-report.xml +++ b/testdata/31-report.xml @@ -1,5 +1,5 @@ - + @@ -12,28 +12,28 @@ - + - failing1/failing_test.go:15: undefined: x + failing1/failing_test.go:15: undefined: x - + - failing2/another_failing_test.go:20: undefined: y + failing2/another_failing_test.go:20: undefined: y - + - setupfailing1/failing_test.go:4: cannot find package "other/package" in any of: /path/vendor (vendor tree) /path/go/root (from $GOROOT) /path/go/path (from $GOPATH) + setupfailing1/failing_test.go:4: cannot find package "other/package" in any of: /path/vendor (vendor tree) /path/go/root (from $GOROOT) /path/go/path (from $GOPATH) diff --git a/testdata/32-report.xml b/testdata/32-report.xml index 4b09a2d..4666169 100644 --- a/testdata/32-report.xml +++ b/testdata/32-report.xml @@ -1,12 +1,12 @@ - - + + - panic: panic + panic: panic