nhyatt/go-junit-report
1
0
Fork 0
mirror of https://github.com/jstemmer/go-junit-report.git synced 2025-04-18 11:38:07 -05:00
Code Issues Projects Releases Wiki Activity

parser/gotest: Check for prefix that's not part of end-test

Browse Source
This commit is contained in:
Joël Stemmer 2018-04-28 18:00:34 +01:00
parent 6026e8f15e
commit 236bda9d6d
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/parser/gotest/gotest.go
View File

@ -3,6 +3,7 @@ package gotest
import ( import (
"bufio" "bufio"
"fmt"
"io" "io"
"regexp" "regexp"
"strconv" "strconv"
@ -58,7 +59,7 @@ func (p *parser) parseLine(line string) {
} else if strings.HasPrefix(line, "=== PAUSE ") { } else if strings.HasPrefix(line, "=== PAUSE ") {
} else if strings.HasPrefix(line, "=== CONT ") { } else if strings.HasPrefix(line, "=== CONT ") {
} else if matches := regexEndTest.FindStringSubmatch(line); len(matches) == 5 { } else if matches := regexEndTest.FindStringSubmatch(line); len(matches) == 5 {
p.endTest(matches[1], matches[2], matches[3], matches[4]) p.endTest(line, matches[1], matches[2], matches[3], matches[4])
} else if matches := regexStatus.FindStringSubmatch(line); len(matches) == 2 { } else if matches := regexStatus.FindStringSubmatch(line); len(matches) == 2 {
p.status(matches[1]) p.status(matches[1])
} else if matches := regexSummary.FindStringSubmatch(line); len(matches) == 7 { } else if matches := regexSummary.FindStringSubmatch(line); len(matches) == 7 {
@ -93,7 +94,10 @@ func (p *parser) runTest(name string) {
}) })
} }
func (p *parser) endTest(indent, result, name, duration string) { func (p *parser) endTest(line, indent, result, name, duration string) {
if idx := strings.Index(line, fmt.Sprintf("%s--- %s:", indent, result)); idx > 0 {
p.output(line[:idx])
}
_, n := stripIndent(indent) _, n := stripIndent(indent)
p.add(Event{ p.add(Event{
Type: "end_test", Type: "end_test",

10
pkg/parser/gotest/gotest_test.go
View File

@ -288,7 +288,15 @@ var tests = []struct {
{Type: "summary", Result: "ok", Name: "package2/bar", Duration: 4200 * time.Millisecond, CovPct: 99.8, CovPackages: []string{"fmt", "encoding/xml"}}, {Type: "summary", Result: "ok", Name: "package2/bar", Duration: 4200 * time.Millisecond, CovPct: 99.8, CovPackages: []string{"fmt", "encoding/xml"}},
}}, }},
{"19-pass", {"19-pass",
[]Event{}}, []Event{
{Type: "run_test", Id: 1, Name: "TestZ"},
{Type: "output", Data: "some inline text"},
{Type: "end_test", Id: 1, Name: "TestZ", Result: "PASS", Duration: 60 * time.Millisecond},
{Type: "run_test", Id: 2, Name: "TestA"},
{Type: "end_test", Id: 2, Name: "TestA", Result: "PASS", Duration: 100 * time.Millisecond},
{Type: "status", Result: "PASS"},
{Type: "summary", Result: "ok", Name: "package/name", Duration: 160 * time.Millisecond},
}},
{"20-parallel", {"20-parallel",
[]Event{}}, []Event{}},
{"21-cached", {"21-cached",