Skip to content

Commit 3f30451

Browse files
joschimarcuscaisey
joschi
and
marcuscaisey
authored
feat: populate skipped message with last line of test output (#13)
Co-authored-by: Marcus Caisey <marcus@teckna.com>
1 parent 5a66382 commit 3f30451

File tree

9 files changed

+61
-27
lines changed

9 files changed

+61
-27
lines changed

‎junit/junit.go‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,9 +230,18 @@ func createTestcaseForTest(pkgName string, test gtr.Test) Testcase {
230230
Data: formatOutput(test.Output),
231231
}
232232
} else if test.Result == gtr.Skip {
233+
message := ""
234+
data := ""
235+
if len(test.Output) > 0 {
236+
lastIdx := len(test.Output) - 1
237+
message = strings.TrimSpace(test.Output[lastIdx])
238+
if len(test.Output) > 1 {
239+
data = formatOutput(test.Output[:lastIdx])
240+
}
241+
}
233242
tc.Skipped = &Result{
234-
Message: "Skipped",
235-
Data: formatOutput(test.Output),
243+
Message: message,
244+
Data: data,
236245
}
237246
} else if test.Result == gtr.Unknown {
238247
tc.Error = &Result{

‎junit/junit_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ func TestCreateFromReport(t *testing.T) {
105105
Name: "TestSkip",
106106
Classname: "package/name",
107107
Time: "0.000",
108-
Skipped: &Result{Message: "Skipped"},
108+
Skipped: &Result{},
109109
},
110110
{
111111
Name: "TestIncomplete",

‎testdata/001-report.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
<property name="go.version" value="1.0"></property>
2929
</properties>
3030
<testcase name="TestSkip" classname="package/skip" time="0.020">
31-
<skipped message="Skipped"><![CDATA[ skip_test.go:6: skip message]]></skipped>
31+
<skipped message="skip_test.go:6: skip message"></skipped>
3232
</testcase>
3333
<testcase name="TestSkipNow" classname="package/skip" time="0.130">
34-
<skipped message="Skipped"><![CDATA[ skip_test.go:10: log message]]></skipped>
34+
<skipped message="skip_test.go:10: log message"></skipped>
3535
</testcase>
3636
</testsuite>
3737
</testsuites>

‎testdata/012-report.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<failure message="Failed"><![CDATA[ subtests_test.go:10: error message]]></failure>
1515
</testcase>
1616
<testcase name="TestSubtests/Subtest#02" classname="package/subtests" time="0.000">
17-
<skipped message="Skipped"><![CDATA[ subtests_test.go:13: skip message]]></skipped>
17+
<skipped message="subtests_test.go:13: skip message"></skipped>
1818
</testcase>
1919
<testcase name="TestNestedSubtests" classname="package/subtests" time="0.000"></testcase>
2020
<testcase name="TestNestedSubtests/a#1" classname="package/subtests" time="0.000"></testcase>

‎testdata/036-report.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<failure message="Failed"><![CDATA[ bench_test.go:10: fatal message]]></failure>
1212
</testcase>
1313
<testcase name="BenchmarkSkip" classname="package/name/benchfail" time="0.000">
14-
<skipped message="Skipped"><![CDATA[ bench_test.go:14: skip message]]></skipped>
14+
<skipped message="bench_test.go:14: skip message"></skipped>
1515
</testcase>
1616
<system-out><![CDATA[goos: linux
1717
goarch: amd64

‎testdata/107-report.xml‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<testsuites tests="2" skipped="2">
3-
<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">
2+
<testsuites tests="4" skipped="4">
3+
<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">
44
<properties>
55
<property name="go.version" value="1.0"></property>
66
</properties>
7-
<testcase name="TestSkip" classname="package/name/skip" time="0.000">
8-
<skipped message="Skipped"><![CDATA[ skip_test.go:6: skip message]]></skipped>
7+
<testcase name="TestSkip" classname="package/skip" time="0.000">
8+
<skipped message="skip_test.go:6: skip message"></skipped>
99
</testcase>
10-
<testcase name="TestSkipNow" classname="package/name/skip" time="0.000">
11-
<skipped message="Skipped"><![CDATA[ skip_test.go:10: log message]]></skipped>
10+
<testcase name="TestSkipNow" classname="package/skip" time="0.000">
11+
<skipped message="skip_test.go:10: log message"></skipped>
12+
</testcase>
13+
<testcase name="TestSkipNoMessage" classname="package/skip" time="0.000">
14+
<skipped message=""></skipped>
15+
</testcase>
16+
<testcase name="TestSkipLogMessage" classname="package/skip" time="0.000">
17+
<skipped message="skip_test.go:20: skip message"><![CDATA[ skip_test.go:19: log message]]></skipped>
1218
</testcase>
1319
</testsuite>
1420
</testsuites>

‎testdata/107-skip.gojson.txt‎

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,23 @@
1-
{"Time":"2019-10-09T00:00:00.329193863+00:00","Action":"run","Package":"package/name/skip","Test":"TestSkip"}
2-
{"Time":"2019-10-09T00:00:00.329288607+00:00","Action":"output","Package":"package/name/skip","Test":"TestSkip","Output":"=== RUN TestSkip\n"}
3-
{"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"}
4-
{"Time":"2019-10-09T00:00:00.329302577+00:00","Action":"output","Package":"package/name/skip","Test":"TestSkip","Output":"--- SKIP: TestSkip (0.00s)\n"}
5-
{"Time":"2019-10-09T00:00:00.329305698+00:00","Action":"skip","Package":"package/name/skip","Test":"TestSkip","Elapsed":0}
6-
{"Time":"2019-10-09T00:00:00.329309504+00:00","Action":"run","Package":"package/name/skip","Test":"TestSkipNow"}
7-
{"Time":"2019-10-09T00:00:00.329312988+00:00","Action":"output","Package":"package/name/skip","Test":"TestSkipNow","Output":"=== RUN TestSkipNow\n"}
8-
{"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"}
9-
{"Time":"2019-10-09T00:00:00.329319388+00:00","Action":"output","Package":"package/name/skip","Test":"TestSkipNow","Output":"--- SKIP: TestSkipNow (0.00s)\n"}
10-
{"Time":"2019-10-09T00:00:00.329322008+00:00","Action":"skip","Package":"package/name/skip","Test":"TestSkipNow","Elapsed":0}
11-
{"Time":"2019-10-09T00:00:00.329324691+00:00","Action":"output","Package":"package/name/skip","Output":"PASS\n"}
12-
{"Time":"2019-10-09T00:00:00.329392899+00:00","Action":"output","Package":"package/name/skip","Output":"ok \tpackage/name/skip\t0.001s\n"}
13-
{"Time":"2019-10-09T00:00:00.329615729+00:00","Action":"pass","Package":"package/name/skip","Elapsed":0.001}
1+
{"Time":"2023-02-19T23:15:21.674171Z","Action":"run","Package":"package/skip","Test":"TestSkip"}
2+
{"Time":"2023-02-19T23:15:21.674342Z","Action":"output","Package":"package/skip","Test":"TestSkip","Output":"=== RUN TestSkip\n"}
3+
{"Time":"2023-02-19T23:15:21.674352Z","Action":"output","Package":"package/skip","Test":"TestSkip","Output":" skip_test.go:6: skip message\n"}
4+
{"Time":"2023-02-19T23:15:21.674371Z","Action":"output","Package":"package/skip","Test":"TestSkip","Output":"--- SKIP: TestSkip (0.00s)\n"}
5+
{"Time":"2023-02-19T23:15:21.674374Z","Action":"skip","Package":"package/skip","Test":"TestSkip","Elapsed":0}
6+
{"Time":"2023-02-19T23:15:21.674382Z","Action":"run","Package":"package/skip","Test":"TestSkipNow"}
7+
{"Time":"2023-02-19T23:15:21.674386Z","Action":"output","Package":"package/skip","Test":"TestSkipNow","Output":"=== RUN TestSkipNow\n"}
8+
{"Time":"2023-02-19T23:15:21.674388Z","Action":"output","Package":"package/skip","Test":"TestSkipNow","Output":" skip_test.go:10: log message\n"}
9+
{"Time":"2023-02-19T23:15:21.674391Z","Action":"output","Package":"package/skip","Test":"TestSkipNow","Output":"--- SKIP: TestSkipNow (0.00s)\n"}
10+
{"Time":"2023-02-19T23:15:21.674394Z","Action":"skip","Package":"package/skip","Test":"TestSkipNow","Elapsed":0}
11+
{"Time":"2023-02-19T23:15:21.6744Z","Action":"run","Package":"package/skip","Test":"TestSkipNoMessage"}
12+
{"Time":"2023-02-19T23:15:21.674402Z","Action":"output","Package":"package/skip","Test":"TestSkipNoMessage","Output":"=== RUN TestSkipNoMessage\n"}
13+
{"Time":"2023-02-19T23:15:21.674405Z","Action":"output","Package":"package/skip","Test":"TestSkipNoMessage","Output":"--- SKIP: TestSkipNoMessage (0.00s)\n"}
14+
{"Time":"2023-02-19T23:15:21.674407Z","Action":"skip","Package":"package/skip","Test":"TestSkipNoMessage","Elapsed":0}
15+
{"Time":"2023-02-19T23:15:21.674409Z","Action":"run","Package":"package/skip","Test":"TestSkipLogMessage"}
16+
{"Time":"2023-02-19T23:15:21.674411Z","Action":"output","Package":"package/skip","Test":"TestSkipLogMessage","Output":"=== RUN TestSkipLogMessage\n"}
17+
{"Time":"2023-02-19T23:15:21.67442Z","Action":"output","Package":"package/skip","Test":"TestSkipLogMessage","Output":" skip_test.go:19: log message\n"}
18+
{"Time":"2023-02-19T23:15:21.674426Z","Action":"output","Package":"package/skip","Test":"TestSkipLogMessage","Output":" skip_test.go:20: skip message\n"}
19+
{"Time":"2023-02-19T23:15:21.674432Z","Action":"output","Package":"package/skip","Test":"TestSkipLogMessage","Output":"--- SKIP: TestSkipLogMessage (0.00s)\n"}
20+
{"Time":"2023-02-19T23:15:21.674434Z","Action":"skip","Package":"package/skip","Test":"TestSkipLogMessage","Elapsed":0}
21+
{"Time":"2023-02-19T23:15:21.674439Z","Action":"output","Package":"package/skip","Output":"PASS\n"}
22+
{"Time":"2023-02-19T23:15:21.674441Z","Action":"output","Package":"package/skip","Output":"ok \tpackage/skip\n"}
23+
{"Time":"2023-02-19T23:15:21.674448Z","Action":"pass","Package":"package/skip","Elapsed":0}

‎testdata/110-report.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<failure message="Failed"><![CDATA[ bench_test.go:10: fatal message]]></failure>
1212
</testcase>
1313
<testcase name="BenchmarkSkip" classname="package/name/benchfail" time="0.000">
14-
<skipped message="Skipped"><![CDATA[ bench_test.go:14: skip message]]></skipped>
14+
<skipped message="bench_test.go:14: skip message"></skipped>
1515
</testcase>
1616
<system-out><![CDATA[goos: linux
1717
goarch: amd64

‎testdata/src/skip/skip_test.go‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,12 @@ func TestSkipNow(t *testing.T) {
1010
t.Log("log message")
1111
t.SkipNow()
1212
}
13+
14+
func TestSkipNoMessage(t *testing.T) {
15+
t.SkipNow()
16+
}
17+
18+
func TestSkipLogMessage(t *testing.T) {
19+
t.Log("log message")
20+
t.Skip("skip message")
21+
}

0 commit comments

Comments
 (0)