Skip to content

Commit db3831a

Browse files
rickystewartrickystewart
committed
bazci/githubpost: fix pkg calculation from test.xml
Since the `rules_go` upgrade from #156000, we have accidentally included the test name in the package path. This PR fixes that and fixes the associated test case. Release note: none Epic: none
1 parent 5dd32a1 commit db3831a

File tree

3 files changed

+71
-21
lines changed

3 files changed

+71
-21
lines changed

‎pkg/cmd/bazci/githubpost/githubpost.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -516,6 +516,10 @@ func listFailuresFromTestXML(
516516
failures := make(map[scopedTest][]testEvent)
517517
for _, suite := range suites.Suites {
518518
pkg := suite.Name
519+
dotIdx := strings.LastIndexByte(pkg, '.')
520+
if dotIdx > 0 {
521+
pkg = pkg[:dotIdx]
522+
}
519523
for _, testCase := range suite.TestCases {
520524
var result *buildutil.XMLMessage
521525
if testCase.Failure != nil {

‎pkg/cmd/bazci/githubpost/githubpost_test.go‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -421,9 +421,12 @@ func TestListFailuresFromTestXML(t *testing.T) {
421421
title: "util/json: TestJSONErrors failed",
422422
message: `=== RUN TestJSONErrors
423423
--- FAIL: TestJSONErrors (0.00s)
424-
=== RUN TestJSONErrors/frues
425-
json_test.go:278: expected error message to be 'trailing characters after JSON document', but was 'unable to decode JSON: invalid character 'r' in literal false (expecting 'a')'
426-
--- FAIL: TestJSONErrors/frues (0.00s)`,
424+
=== RUN TestJSONErrors/gostd/frues
425+
json_test.go:404:
426+
Error Trace: pkg/util/json/json_test.go:404
427+
Error: Expect "unable to decode JSON: invalid character 'r' in literal false (expecting 'a')" to match "trailing characters after JSON document"
428+
Test: TestJSONErrors/gostd/frues
429+
--- FAIL: TestJSONErrors/gostd/frues (0.00s)`,
427430
mention: []string{"@cockroachdb/unowned"},
428431
}},
429432
},

‎pkg/cmd/bazci/githubpost/testdata/basic.xml‎

Lines changed: 61 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,68 @@
11
<testsuites>
2-
<testsuite errors="0" failures="2" skipped="0" tests="1284" time="0.208" name="github.com/cockroachdb/cockroach/pkg/util/json">
3-
<testcase classname="json" name="TestJSONEncodeRoundTrip" time="0.000"></testcase>
4-
<testcase classname="json" name="TestJSONEncodeStrictRoundTrip" time="0.000"></testcase>
2+
<testsuite errors="0" failures="2" skipped="0" tests="60" time="0.002" name="github.com/cockroachdb/cockroach/pkg/util/json.TestJSONErrors" timestamp="2025-11-05T20:51:03.644Z">
53
<testcase classname="json" name="TestJSONErrors" time="0.000">
64
<failure message="Failed" type="">=== RUN TestJSONErrors&#xA;--- FAIL: TestJSONErrors (0.00s)&#xA;</failure>
75
</testcase>
8-
<testcase classname="json" name="TestJSONErrors/&#34;\b&#34;" time="0.000"></testcase>
9-
<testcase classname="json" name="TestJSONErrors/&#34;\v&#34;" time="0.000"></testcase>
10-
<testcase classname="json" name="TestJSONErrors/&#34;\x00&#34;" time="0.000"></testcase>
11-
<testcase classname="json" name="TestJSONErrors/&#34;_&#34;" time="0.000"></testcase>
12-
<testcase classname="json" name="TestJSONErrors/01" time="0.000"></testcase>
13-
<testcase classname="json" name="TestJSONErrors/1_2_3" time="0.000"></testcase>
14-
<testcase classname="json" name="TestJSONErrors/[1,_2,_3]]" time="0.000"></testcase>
15-
<testcase classname="json" name="TestJSONErrors/[1,_2,_3]}_do_not_ignore" time="0.000"></testcase>
16-
<testcase classname="json" name="TestJSONErrors/frues" time="0.000">
17-
<failure message="Failed" type="">=== RUN TestJSONErrors/frues&#xA; json_test.go:278: expected error message to be &#39;trailing characters after JSON document&#39;, but was &#39;unable to decode JSON: invalid character &#39;r&#39; in literal false (expecting &#39;a&#39;)&#39;&#xA; --- FAIL: TestJSONErrors/frues (0.00s)&#xA;</failure>
6+
<testcase classname="json" name="TestJSONErrors/gostd/&#34;\b&#34;" time="0.000"></testcase>
7+
<testcase classname="json" name="TestJSONErrors/gostd/&#34;\v&#34;" time="0.000"></testcase>
8+
<testcase classname="json" name="TestJSONErrors/gostd/&#34;\x00&#34;" time="0.000"></testcase>
9+
<testcase classname="json" name="TestJSONErrors/gostd/&#34;_&#34;" time="0.000"></testcase>
10+
<testcase classname="json" name="TestJSONErrors/gostd/-" time="0.000"></testcase>
11+
<testcase classname="json" name="TestJSONErrors/gostd/--01" time="0.000"></testcase>
12+
<testcase classname="json" name="TestJSONErrors/gostd/01" time="0.000"></testcase>
13+
<testcase classname="json" name="TestJSONErrors/gostd/1_2_3" time="0.000"></testcase>
14+
<testcase classname="json" name="TestJSONErrors/gostd/[,]" time="0.000"></testcase>
15+
<testcase classname="json" name="TestJSONErrors/gostd/[1,]" time="0.000"></testcase>
16+
<testcase classname="json" name="TestJSONErrors/gostd/[1,_2,_3]]" time="0.000"></testcase>
17+
<testcase classname="json" name="TestJSONErrors/gostd/[1,_2,_3]___}___" time="0.000"></testcase>
18+
<testcase classname="json" name="TestJSONErrors/gostd/[1,_[2,]]" time="0.000"></testcase>
19+
<testcase classname="json" name="TestJSONErrors/gostd/[1,_[2,_3],]" time="0.000"></testcase>
20+
<testcase classname="json" name="TestJSONErrors/gostd/[1,_{&#34;a&#34;:&#34;b&#34;,}]" time="0.000"></testcase>
21+
<testcase classname="json" name="TestJSONErrors/gostd/[1,_{&#34;a&#34;:&#34;b&#34;},]" time="0.000"></testcase>
22+
<testcase classname="json" name="TestJSONErrors/gostd/\u" time="0.000"></testcase>
23+
<testcase classname="json" name="TestJSONErrors/gostd/\u1" time="0.000"></testcase>
24+
<testcase classname="json" name="TestJSONErrors/gostd/\u111z" time="0.000"></testcase>
25+
<testcase classname="json" name="TestJSONErrors/gostd/frues" time="0.000">
26+
<failure message="Failed" type="">=== RUN TestJSONErrors/gostd/frues&#xA; json_test.go:404: &#xA; &#x9;Error Trace:&#x9;pkg/util/json/json_test.go:404&#xA; &#x9;Error: &#x9;Expect &#34;unable to decode JSON: invalid character &#39;r&#39; in literal false (expecting &#39;a&#39;)&#34; to match &#34;trailing characters after JSON document&#34;&#xA; &#x9;Test: &#x9;TestJSONErrors/gostd/frues&#xA;--- FAIL: TestJSONErrors/gostd/frues (0.00s)&#xA;</failure>
1827
</testcase>
19-
<testcase classname="json" name="TestJSONErrors/true_false" time="0.000"></testcase>
20-
<testcase classname="json" name="TestJSONErrors/{" time="0.000"></testcase>
21-
<testcase classname="json" name="TestJSONErrors/{&#34;foo&#34;:_01}" time="0.000"></testcase>
22-
<testcase classname="json" name="TestJSONErrors/{&#39;foo&#39;:_1}" time="0.000"></testcase>
23-
<testcase classname="json" name="TestJSONErrors/{foo:_1}" time="0.000"></testcase>
28+
<testcase classname="json" name="TestJSONErrors/gostd/true_false" time="0.000"></testcase>
29+
<testcase classname="json" name="TestJSONErrors/gostd/trues" time="0.000"></testcase>
30+
<testcase classname="json" name="TestJSONErrors/gostd/{" time="0.000"></testcase>
31+
<testcase classname="json" name="TestJSONErrors/gostd/{&#34;a&#34;:[&#34;b&#34;,&#34;c&#34;]}]" time="0.000"></testcase>
32+
<testcase classname="json" name="TestJSONErrors/gostd/{&#34;b&#34;:_false,_}" time="0.000"></testcase>
33+
<testcase classname="json" name="TestJSONErrors/gostd/{&#34;foo&#34;:_01}" time="0.000"></testcase>
34+
<testcase classname="json" name="TestJSONErrors/gostd/{&#34;k&#34;:,}" time="0.000"></testcase>
35+
<testcase classname="json" name="TestJSONErrors/gostd/{&#34;k&#34;:_[1,]}" time="0.000"></testcase>
36+
<testcase classname="json" name="TestJSONErrors/gostd/{&#39;foo&#39;:_1}" time="0.000"></testcase>
37+
<testcase classname="json" name="TestJSONErrors/gostd/{foo:_1}" time="0.000"></testcase>
38+
<testcase classname="json" name="TestJSONErrors/lexer/&#34;\b&#34;" time="0.000"></testcase>
39+
<testcase classname="json" name="TestJSONErrors/lexer/&#34;\v&#34;" time="0.000"></testcase>
40+
<testcase classname="json" name="TestJSONErrors/lexer/&#34;\x00&#34;" time="0.000"></testcase>
41+
<testcase classname="json" name="TestJSONErrors/lexer/&#34;_&#34;" time="0.000"></testcase>
42+
<testcase classname="json" name="TestJSONErrors/lexer/-" time="0.000"></testcase>
43+
<testcase classname="json" name="TestJSONErrors/lexer/--01" time="0.000"></testcase>
44+
<testcase classname="json" name="TestJSONErrors/lexer/01" time="0.000"></testcase>
45+
<testcase classname="json" name="TestJSONErrors/lexer/1_2_3" time="0.000"></testcase>
46+
<testcase classname="json" name="TestJSONErrors/lexer/[,]" time="0.000"></testcase>
47+
<testcase classname="json" name="TestJSONErrors/lexer/[1,]" time="0.000"></testcase>
48+
<testcase classname="json" name="TestJSONErrors/lexer/[1,_2,_3]]" time="0.000"></testcase>
49+
<testcase classname="json" name="TestJSONErrors/lexer/[1,_2,_3]___}___" time="0.000"></testcase>
50+
<testcase classname="json" name="TestJSONErrors/lexer/[1,_[2,]]" time="0.000"></testcase>
51+
<testcase classname="json" name="TestJSONErrors/lexer/[1,_[2,_3],]" time="0.000"></testcase>
52+
<testcase classname="json" name="TestJSONErrors/lexer/[1,_{&#34;a&#34;:&#34;b&#34;,}]" time="0.000"></testcase>
53+
<testcase classname="json" name="TestJSONErrors/lexer/[1,_{&#34;a&#34;:&#34;b&#34;},]" time="0.000"></testcase>
54+
<testcase classname="json" name="TestJSONErrors/lexer/\u" time="0.000"></testcase>
55+
<testcase classname="json" name="TestJSONErrors/lexer/\u1" time="0.000"></testcase>
56+
<testcase classname="json" name="TestJSONErrors/lexer/\u111z" time="0.000"></testcase>
57+
<testcase classname="json" name="TestJSONErrors/lexer/true_false" time="0.000"></testcase>
58+
<testcase classname="json" name="TestJSONErrors/lexer/trues" time="0.000"></testcase>
59+
<testcase classname="json" name="TestJSONErrors/lexer/{" time="0.000"></testcase>
60+
<testcase classname="json" name="TestJSONErrors/lexer/{&#34;a&#34;:[&#34;b&#34;,&#34;c&#34;]}]" time="0.000"></testcase>
61+
<testcase classname="json" name="TestJSONErrors/lexer/{&#34;b&#34;:_false,_}" time="0.000"></testcase>
62+
<testcase classname="json" name="TestJSONErrors/lexer/{&#34;foo&#34;:_01}" time="0.000"></testcase>
63+
<testcase classname="json" name="TestJSONErrors/lexer/{&#34;k&#34;:,}" time="0.000"></testcase>
64+
<testcase classname="json" name="TestJSONErrors/lexer/{&#34;k&#34;:_[1,]}" time="0.000"></testcase>
65+
<testcase classname="json" name="TestJSONErrors/lexer/{&#39;foo&#39;:_1}" time="0.000"></testcase>
66+
<testcase classname="json" name="TestJSONErrors/lexer/{foo:_1}" time="0.000"></testcase>
2467
</testsuite>
2568
</testsuites>

0 commit comments

Comments
 (0)