From a4c479dbbbab7f8f83500683e480b4e98cadb741 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Stemmer?= Date: Sun, 20 Mar 2022 00:30:16 +0000 Subject: [PATCH] gtr: Reset builder state after the end of a test or benchmark The consequence of this is that any output emitted after the test or benchmark result, will no longer belong to the last test. Instead it will be appended to the global log. This is necessary to correctly attribute output to the correct test or benchmark, for example in cases where both tests and benchmarks appear. In the past, Go test output printed test logs after the test result. However, from Go 1.14 this behaviour was changed and test logs are now printed before the test result. With this commit, we effectively no longer support the old behaviour in Go1.13 and earlier. The output will still appear in the generated report, however it will no longer belong to the correct test. --- parser/gotest/report_builder.go | 16 +++++++++------- testdata/109-report.xml | 3 +++ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/parser/gotest/report_builder.go b/parser/gotest/report_builder.go index 26b4ca2..e6c82bf 100644 --- a/parser/gotest/report_builder.go +++ b/parser/gotest/report_builder.go @@ -89,9 +89,9 @@ func (b *reportBuilder) ContinueTest(name string) { } // EndTest finds the test with the given name, sets the result, duration and -// level, and marks it as active. If more than one test exists with this name, -// the most recently created test will be used. If no test exists with this -// name, a new test is created. +// level. If more than one test exists with this name, the most recently +// created test will be used. If no test exists with this name, a new test is +// created. func (b *reportBuilder) EndTest(name, result string, duration time.Duration, level int) { b.lastId = b.findTest(name) if b.lastId < 0 { @@ -106,6 +106,7 @@ func (b *reportBuilder) EndTest(name, result string, duration time.Duration, lev t.Duration = duration t.Level = level b.tests[b.lastId] = t + b.lastId = 0 } // End marks the active context as no longer active. @@ -144,10 +145,10 @@ func (b *reportBuilder) BenchmarkResult(name string, iterations int64, nsPerOp, } } -// EndBenchmark finds the benchmark with the given name, sets the result and -// marks it as active. If more than one benchmark exists with this name, the -// most recently created benchmark will be used. If no benchmark exists with -// this name, a new benchmark is created. +// EndBenchmark finds the benchmark with the given name and sets the result. If +// more than one benchmark exists with this name, the most recently created +// benchmark will be used. If no benchmark exists with this name, a new +// benchmark is created. func (b *reportBuilder) EndBenchmark(name, result string) { b.lastId = b.findBenchmark(name) if b.lastId < 0 { @@ -157,6 +158,7 @@ func (b *reportBuilder) EndBenchmark(name, result string) { bm := b.benchmarks[b.lastId] bm.Result = parseResult(result) b.benchmarks[b.lastId] = bm + b.lastId = 0 } // CreateBuildError creates a new build error and marks it as active. diff --git a/testdata/109-report.xml b/testdata/109-report.xml index e7a7957..80749f1 100644 --- a/testdata/109-report.xml +++ b/testdata/109-report.xml @@ -8,5 +8,8 @@ +