Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: populate <skipped> message with last line of test output #158

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@ on pkg.go.dev for more information:

## Changelog

### v2.1.0
- Populate <skipped> node message attribute with last line of output from test

### v2.0.0

- Support for parsing `go test -json` output.
Expand Down
12 changes: 10 additions & 2 deletions junit/junit.go
Original file line number Diff line number Diff line change
Expand Up @@ -228,9 +228,17 @@ func createTestcaseForTest(pkgName string, test gtr.Test) Testcase {
Data: formatOutput(test.Output),
}
} else if test.Result == gtr.Skip {
message := ""
data := ""
if len(test.Output) > 0 {
message = strings.TrimSpace(test.Output[len(test.Output)-1])
if len(test.Output) > 1 {
data = formatOutput(test.Output[:len(test.Output)-1])
}
}
tc.Skipped = &Result{
Message: "Skipped",
Data: formatOutput(test.Output),
Message: message,
Data: data,
}
} else if test.Result == gtr.Unknown {
tc.Error = &Result{
Expand Down
2 changes: 1 addition & 1 deletion junit/junit_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ func TestCreateFromReport(t *testing.T) {
Name: "TestSkip",
Classname: "package/name",
Time: "0.000",
Skipped: &Result{Message: "Skipped"},
Skipped: &Result{},
},
{
Name: "TestIncomplete",
Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (

// Current release information printed by the -version flag.
var (
Version = "v2.0.0-dev"
Version = "v2.1.0"
Revision = "HEAD"
BuildTime string
)
Expand Down
4 changes: 2 additions & 2 deletions testdata/001-report.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
<property name="go.version" value="1.0"></property>
</properties>
<testcase name="TestSkip" classname="package/skip" time="0.020">
<skipped message="Skipped"><![CDATA[ skip_test.go:6: skip message]]></skipped>
<skipped message="skip_test.go:6: skip message"></skipped>
</testcase>
<testcase name="TestSkipNow" classname="package/skip" time="0.130">
<skipped message="Skipped"><![CDATA[ skip_test.go:10: log message]]></skipped>
<skipped message="skip_test.go:10: log message"></skipped>
</testcase>
</testsuite>
</testsuites>
2 changes: 1 addition & 1 deletion testdata/012-report.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<failure message="Failed"><![CDATA[ subtests_test.go:10: error message]]></failure>
</testcase>
<testcase name="TestSubtests/Subtest#02" classname="package/subtests" time="0.000">
<skipped message="Skipped"><![CDATA[ subtests_test.go:13: skip message]]></skipped>
<skipped message="subtests_test.go:13: skip message"></skipped>
</testcase>
<testcase name="TestNestedSubtests" classname="package/subtests" time="0.000"></testcase>
<testcase name="TestNestedSubtests/a#1" classname="package/subtests" time="0.000"></testcase>
Expand Down
2 changes: 1 addition & 1 deletion testdata/036-report.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<failure message="Failed"><![CDATA[ bench_test.go:10: fatal message]]></failure>
</testcase>
<testcase name="BenchmarkSkip" classname="package/name/benchfail" time="0.000">
<skipped message="Skipped"><![CDATA[ bench_test.go:14: skip message]]></skipped>
<skipped message="bench_test.go:14: skip message"></skipped>
</testcase>
<system-out><![CDATA[goos: linux
goarch: amd64
Expand Down
18 changes: 12 additions & 6 deletions testdata/107-report.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<testsuites tests="2" skipped="2">
<testsuite name="package/name/skip" tests="2" failures="0" errors="0" id="0" hostname="hostname" skipped="2" time="0.001" timestamp="2022-01-01T00:00:00Z">
<testsuites tests="4" skipped="4">
<testsuite name="package/skip" tests="4" failures="0" errors="0" id="0" hostname="hostname" skipped="4" time="0.000" timestamp="2022-01-01T00:00:00Z">
<properties>
<property name="go.version" value="1.0"></property>
</properties>
<testcase name="TestSkip" classname="package/name/skip" time="0.000">
<skipped message="Skipped"><![CDATA[ skip_test.go:6: skip message]]></skipped>
<testcase name="TestSkip" classname="package/skip" time="0.000">
<skipped message="skip_test.go:6: skip message"></skipped>
</testcase>
<testcase name="TestSkipNow" classname="package/name/skip" time="0.000">
<skipped message="Skipped"><![CDATA[ skip_test.go:10: log message]]></skipped>
<testcase name="TestSkipNow" classname="package/skip" time="0.000">
<skipped message="skip_test.go:10: log message"></skipped>
</testcase>
<testcase name="TestSkipNoMessage" classname="package/skip" time="0.000">
<skipped message=""></skipped>
</testcase>
<testcase name="TestSkipLogMessage" classname="package/skip" time="0.000">
<skipped message="skip_test.go:20: skip message"><![CDATA[ skip_test.go:19: log message]]></skipped>
</testcase>
</testsuite>
</testsuites>
36 changes: 23 additions & 13 deletions testdata/107-skip.gojson.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,23 @@
{"Time":"2019-10-09T00:00:00.329193863+00:00","Action":"run","Package":"package/name/skip","Test":"TestSkip"}
{"Time":"2019-10-09T00:00:00.329288607+00:00","Action":"output","Package":"package/name/skip","Test":"TestSkip","Output":"=== RUN TestSkip\n"}
{"Time":"2019-10-09T00:00:00.32929713+00:00","Action":"output","Package":"package/name/skip","Test":"TestSkip","Output":" skip_test.go:6: skip message\n"}
{"Time":"2019-10-09T00:00:00.329302577+00:00","Action":"output","Package":"package/name/skip","Test":"TestSkip","Output":"--- SKIP: TestSkip (0.00s)\n"}
{"Time":"2019-10-09T00:00:00.329305698+00:00","Action":"skip","Package":"package/name/skip","Test":"TestSkip","Elapsed":0}
{"Time":"2019-10-09T00:00:00.329309504+00:00","Action":"run","Package":"package/name/skip","Test":"TestSkipNow"}
{"Time":"2019-10-09T00:00:00.329312988+00:00","Action":"output","Package":"package/name/skip","Test":"TestSkipNow","Output":"=== RUN TestSkipNow\n"}
{"Time":"2019-10-09T00:00:00.329315853+00:00","Action":"output","Package":"package/name/skip","Test":"TestSkipNow","Output":" skip_test.go:10: log message\n"}
{"Time":"2019-10-09T00:00:00.329319388+00:00","Action":"output","Package":"package/name/skip","Test":"TestSkipNow","Output":"--- SKIP: TestSkipNow (0.00s)\n"}
{"Time":"2019-10-09T00:00:00.329322008+00:00","Action":"skip","Package":"package/name/skip","Test":"TestSkipNow","Elapsed":0}
{"Time":"2019-10-09T00:00:00.329324691+00:00","Action":"output","Package":"package/name/skip","Output":"PASS\n"}
{"Time":"2019-10-09T00:00:00.329392899+00:00","Action":"output","Package":"package/name/skip","Output":"ok \tpackage/name/skip\t0.001s\n"}
{"Time":"2019-10-09T00:00:00.329615729+00:00","Action":"pass","Package":"package/name/skip","Elapsed":0.001}
{"Time":"2023-02-19T23:15:21.674171Z","Action":"run","Package":"package/skip","Test":"TestSkip"}
{"Time":"2023-02-19T23:15:21.674342Z","Action":"output","Package":"package/skip","Test":"TestSkip","Output":"=== RUN TestSkip\n"}
{"Time":"2023-02-19T23:15:21.674352Z","Action":"output","Package":"package/skip","Test":"TestSkip","Output":" skip_test.go:6: skip message\n"}
{"Time":"2023-02-19T23:15:21.674371Z","Action":"output","Package":"package/skip","Test":"TestSkip","Output":"--- SKIP: TestSkip (0.00s)\n"}
{"Time":"2023-02-19T23:15:21.674374Z","Action":"skip","Package":"package/skip","Test":"TestSkip","Elapsed":0}
{"Time":"2023-02-19T23:15:21.674382Z","Action":"run","Package":"package/skip","Test":"TestSkipNow"}
{"Time":"2023-02-19T23:15:21.674386Z","Action":"output","Package":"package/skip","Test":"TestSkipNow","Output":"=== RUN TestSkipNow\n"}
{"Time":"2023-02-19T23:15:21.674388Z","Action":"output","Package":"package/skip","Test":"TestSkipNow","Output":" skip_test.go:10: log message\n"}
{"Time":"2023-02-19T23:15:21.674391Z","Action":"output","Package":"package/skip","Test":"TestSkipNow","Output":"--- SKIP: TestSkipNow (0.00s)\n"}
{"Time":"2023-02-19T23:15:21.674394Z","Action":"skip","Package":"package/skip","Test":"TestSkipNow","Elapsed":0}
{"Time":"2023-02-19T23:15:21.6744Z","Action":"run","Package":"package/skip","Test":"TestSkipNoMessage"}
{"Time":"2023-02-19T23:15:21.674402Z","Action":"output","Package":"package/skip","Test":"TestSkipNoMessage","Output":"=== RUN TestSkipNoMessage\n"}
{"Time":"2023-02-19T23:15:21.674405Z","Action":"output","Package":"package/skip","Test":"TestSkipNoMessage","Output":"--- SKIP: TestSkipNoMessage (0.00s)\n"}
{"Time":"2023-02-19T23:15:21.674407Z","Action":"skip","Package":"package/skip","Test":"TestSkipNoMessage","Elapsed":0}
{"Time":"2023-02-19T23:15:21.674409Z","Action":"run","Package":"package/skip","Test":"TestSkipLogMessage"}
{"Time":"2023-02-19T23:15:21.674411Z","Action":"output","Package":"package/skip","Test":"TestSkipLogMessage","Output":"=== RUN TestSkipLogMessage\n"}
{"Time":"2023-02-19T23:15:21.67442Z","Action":"output","Package":"package/skip","Test":"TestSkipLogMessage","Output":" skip_test.go:19: log message\n"}
{"Time":"2023-02-19T23:15:21.674426Z","Action":"output","Package":"package/skip","Test":"TestSkipLogMessage","Output":" skip_test.go:20: skip message\n"}
{"Time":"2023-02-19T23:15:21.674432Z","Action":"output","Package":"package/skip","Test":"TestSkipLogMessage","Output":"--- SKIP: TestSkipLogMessage (0.00s)\n"}
{"Time":"2023-02-19T23:15:21.674434Z","Action":"skip","Package":"package/skip","Test":"TestSkipLogMessage","Elapsed":0}
{"Time":"2023-02-19T23:15:21.674439Z","Action":"output","Package":"package/skip","Output":"PASS\n"}
{"Time":"2023-02-19T23:15:21.674441Z","Action":"output","Package":"package/skip","Output":"ok \tpackage/skip\n"}
{"Time":"2023-02-19T23:15:21.674448Z","Action":"pass","Package":"package/skip","Elapsed":0}
2 changes: 1 addition & 1 deletion testdata/110-report.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<failure message="Failed"><![CDATA[ bench_test.go:10: fatal message]]></failure>
</testcase>
<testcase name="BenchmarkSkip" classname="package/name/benchfail" time="0.000">
<skipped message="Skipped"><![CDATA[ bench_test.go:14: skip message]]></skipped>
<skipped message="bench_test.go:14: skip message"></skipped>
</testcase>
<system-out><![CDATA[goos: linux
goarch: amd64
Expand Down
9 changes: 9 additions & 0 deletions testdata/src/skip/skip_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,12 @@ func TestSkipNow(t *testing.T) {
t.Log("log message")
t.SkipNow()
}

func TestSkipNoMessage(t *testing.T) {
t.SkipNow()
}

func TestSkipLogMessage(t *testing.T) {
t.Log("log message")
t.Skip("skip message")
}