From a70d508a2e93b49ceb5244aebdbf75a30e371fff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Stemmer?= Date: Sun, 13 Mar 2022 00:22:02 +0000 Subject: [PATCH] parser/gotest: support parsing test summaries when there were no tests --- go-junit-report_test.go | 4 ++++ pkg/parser/gotest/gotest.go | 23 ++++++++++++++++++----- pkg/parser/gotest/gotest_test.go | 12 +++++++++++- testdata/34-notest.txt | 5 +++++ testdata/34-report.xml | 18 ++++++++++++++++++ 5 files changed, 56 insertions(+), 6 deletions(-) create mode 100644 testdata/34-notest.txt create mode 100644 testdata/34-report.xml diff --git a/go-junit-report_test.go b/go-junit-report_test.go index 7909444..30dfd78 100644 --- a/go-junit-report_test.go +++ b/go-junit-report_test.go @@ -166,6 +166,10 @@ var testCases = []TestCase{ name: "33-bench-mb.txt", reportName: "33-report.xml", }, + { + name: "34-notest.txt", + reportName: "34-report.xml", + }, } func TestNewOutput(t *testing.T) { diff --git a/pkg/parser/gotest/gotest.go b/pkg/parser/gotest/gotest.go index ab9b9b7..95b323f 100644 --- a/pkg/parser/gotest/gotest.go +++ b/pkg/parser/gotest/gotest.go @@ -19,7 +19,20 @@ var ( regexCoverage = regexp.MustCompile(`^coverage:\s+(\d+|\d+\.\d+)%\s+of\s+statements(?:\sin\s(.+))?$`) regexEndTest = regexp.MustCompile(`((?: )*)--- (PASS|FAIL|SKIP): ([^ ]+) \((\d+\.\d+)(?: seconds|s)\)`) regexStatus = regexp.MustCompile(`^(PASS|FAIL|SKIP)$`) - regexSummary = regexp.MustCompile(`^(ok|FAIL)\s+([^ ]+)\s+(?:(\d+\.\d+)s|(\(cached\)|\[\w+ failed]))(?:\s+coverage:\s+(\d+\.\d+)%\sof\sstatements(?:\sin\s(.+))?)?$`) + regexSummary = regexp.MustCompile(`` + + // 1: result + `^(\?|ok|FAIL)` + + // 2: package name + `\s+([^ \t]+)` + + // 3: duration (optional) + `(?:\s+(\d+\.\d+)s)?` + + // 4: cached indicator (optional) + `(?:\s+(\(cached\)))?` + + // 5: [status message] (optional) + `(?:\s+(\[[^\]]+\]))?` + + // 6: coverage percentage (optional) + // 7: coverage package list (optional) + `(?:\s+coverage:\s+(\d+\.\d+)%\sof\sstatements(?:\sin\s(.+))?)?$`) ) // Parse parses Go test output from the given io.Reader r. @@ -48,8 +61,8 @@ func (p *parser) parseLine(line string) { p.endTest(line, matches[1], matches[2], matches[3], matches[4]) } else if matches := regexStatus.FindStringSubmatch(line); len(matches) == 2 { p.status(matches[1]) - } else if matches := regexSummary.FindStringSubmatch(line); len(matches) == 7 { - p.summary(matches[1], matches[2], matches[3], matches[4], matches[5], matches[6]) + } else if matches := regexSummary.FindStringSubmatch(line); len(matches) == 8 { + p.summary(matches[1], matches[2], matches[3], matches[4], matches[5], matches[6], matches[7]) } else if matches := regexCoverage.FindStringSubmatch(line); len(matches) == 3 { p.coverage(matches[1], matches[2]) } else if matches := regexBenchmark.FindStringSubmatch(line); len(matches) == 7 { @@ -101,13 +114,13 @@ func (p *parser) status(result string) { p.add(gtr.Event{Type: "status", Result: result}) } -func (p *parser) summary(result, name, duration, data, covpct, packages string) { +func (p *parser) summary(result, name, duration, cached, status, covpct, packages string) { p.add(gtr.Event{ Type: "summary", Result: result, Name: name, Duration: parseSeconds(duration), - Data: data, + Data: strings.TrimSpace(cached + " " + status), CovPct: parseFloat(covpct), CovPackages: parsePackages(packages), }) diff --git a/pkg/parser/gotest/gotest_test.go b/pkg/parser/gotest/gotest_test.go index 81902b4..7e9e307 100644 --- a/pkg/parser/gotest/gotest_test.go +++ b/pkg/parser/gotest/gotest_test.go @@ -76,12 +76,22 @@ var tests = []struct { "FAIL package/name/failing [build failed]", "FAIL package/other/failing [setup failed]", "ok package/other (cached)", + "ok package/name 0.400s coverage: 10.0% of statements", + "ok package/name 4.200s coverage: 99.8% of statements in fmt, encoding/xml", + "? package/name [no test files]", + "ok package/name 0.001s [no tests to run]", + "ok package/name (cached) [no tests to run]", ), []gtr.Event{ {Type: "summary", Name: "package/name/ok", Result: "ok", Duration: 100 * time.Millisecond}, {Type: "summary", Name: "package/name/failing", Result: "FAIL", Data: "[build failed]"}, {Type: "summary", Name: "package/other/failing", Result: "FAIL", Data: "[setup failed]"}, {Type: "summary", Name: "package/other", Result: "ok", Data: "(cached)"}, + {Type: "summary", Name: "package/name", Result: "ok", Duration: 400 * time.Millisecond, CovPct: 10}, + {Type: "summary", Name: "package/name", Result: "ok", Duration: 4200 * time.Millisecond, CovPct: 99.8, CovPackages: []string{"fmt", "encoding/xml"}}, + {Type: "summary", Name: "package/name", Result: "?", Data: "[no test files]"}, + {Type: "summary", Name: "package/name", Result: "ok", Duration: 1 * time.Millisecond, Data: "[no tests to run]"}, + {Type: "summary", Name: "package/name", Result: "ok", Data: "(cached) [no tests to run]"}, }, }, { @@ -162,7 +172,7 @@ func testParse(t *testing.T, name, input string, want []gtr.Event) { } if diff := cmp.Diff(got, want); diff != "" { - t.Errorf("Parse returned unexpected events, diff (-got, +want):\n%v", diff) + t.Errorf("Parse returned unexpected events, input:\n%s\ndiff (-got, +want):\n%v", input, diff) } } diff --git a/testdata/34-notest.txt b/testdata/34-notest.txt new file mode 100644 index 0000000..ebe1b11 --- /dev/null +++ b/testdata/34-notest.txt @@ -0,0 +1,5 @@ +? package/name [no test files] +testing: warning: no tests to run +PASS +ok package/name 0.001s [no tests to run] +ok package/name (cached) [no tests to run] diff --git a/testdata/34-report.xml b/testdata/34-report.xml new file mode 100644 index 0000000..18e3f34 --- /dev/null +++ b/testdata/34-report.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + +