Skip to content

Commit 837998e

Browse files
craig[bot]rickystewart
craig[bot]
and
rickystewart
committed
Merge #159323
159323: build/util: remove unnecessary `Classname` attribute r=rail a=rickystewart This was added back in, I think accidentally as a result of a bad copy-paste, in `8e6b3935749df40aac835aad15c2b8337426f9f4`. This restores the previous behavior. Note that the comment talks about how `Classname` is missing, so we expect it not to be there. Release justification: Non-production code changes Part of: DEVINF-1658 Epic: DEVINF-1582 Release note: none Co-authored-by: Ricky Stewart <[email protected]>
2 parents 2f2800e + 2318622 commit 837998e

File tree

2 files changed

+90
-91
lines changed

2 files changed

+90
-91
lines changed

‎pkg/build/util/util.go‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,11 @@ type testCase struct {
4545
// this isn't Java so there isn't a classname) and excluding it causes
4646
// the TeamCity UI to display the same data in a slightly more coherent
4747
// and usable way.
48-
Classname string `xml:"classname,attr"`
49-
Name string `xml:"name,attr"`
50-
Time string `xml:"time,attr"`
51-
Failure *XMLMessage `xml:"failure,omitempty"`
52-
Error *XMLMessage `xml:"error,omitempty"`
53-
Skipped *XMLMessage `xml:"skipped,omitempty"`
48+
Name string `xml:"name,attr"`
49+
Time string `xml:"time,attr"`
50+
Failure *XMLMessage `xml:"failure,omitempty"`
51+
Error *XMLMessage `xml:"error,omitempty"`
52+
Skipped *XMLMessage `xml:"skipped,omitempty"`
5453
}
5554

5655
// XMLMessage is a catch-all structure containing details about a test

‎pkg/build/util/util_test.go‎

Lines changed: 85 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -118,79 +118,79 @@ func TestOutputsOfGenrule(t *testing.T) {
118118
func TestMergeXml(t *testing.T) {
119119
const xml1 = `<testsuites>
120120
<testsuite errors="0" failures="1" skipped="0" tests="6" time="0.010" name="github.com/cockroachdb/cockroach/pkg/cmd/dev.TestDataDriven" timestamp="2025-10-31T16:31:54.004Z">
121-
<testcase classname="dev" name="TestDataDriven" time="0.010"></testcase>
122-
<testcase classname="dev" name="TestDataDriven/bench" time="0.000"></testcase>
123-
<testcase classname="dev" name="TestDataDriven/dev-build" time="0.000"></testcase>
124-
<testcase classname="dev" name="TestDataDriven/generate" time="0.000"></testcase>
125-
<testcase classname="dev" name="TestDataDriven/testlogic" time="0.000"></testcase>
126-
<testcase classname="dev" name="TestDataDriven/ui" time="0.000">
121+
<testcase name="TestDataDriven" time="0.010"></testcase>
122+
<testcase name="TestDataDriven/bench" time="0.000"></testcase>
123+
<testcase name="TestDataDriven/dev-build" time="0.000"></testcase>
124+
<testcase name="TestDataDriven/generate" time="0.000"></testcase>
125+
<testcase name="TestDataDriven/testlogic" time="0.000"></testcase>
126+
<testcase name="TestDataDriven/ui" time="0.000">
127127
<failure message="Failed" type="">FAILED</failure>
128128
</testcase>
129129
</testsuite>
130130
<testsuite errors="0" failures="0" skipped="0" tests="11" time="0.002" name="github.com/cockroachdb/cockroach/pkg/cmd/dev.TestRecorderDriven" timestamp="2025-10-31T16:31:54.010Z">
131-
<testcase classname="dev" name="TestRecorderDriven" time="0.000"></testcase>
132-
<testcase classname="dev" name="TestRecorderDriven/builder" time="0.000"></testcase>
133-
<testcase classname="dev" name="TestRecorderDriven/builder#01" time="0.000"></testcase>
134-
<testcase classname="dev" name="TestRecorderDriven/dev-build" time="0.000"></testcase>
135-
<testcase classname="dev" name="TestRecorderDriven/dev-build#01" time="0.000"></testcase>
136-
<testcase classname="dev" name="TestRecorderDriven/generate" time="0.000"></testcase>
137-
<testcase classname="dev" name="TestRecorderDriven/generate#01" time="0.000"></testcase>
138-
<testcase classname="dev" name="TestRecorderDriven/lint" time="0.000"></testcase>
139-
<testcase classname="dev" name="TestRecorderDriven/lint#01" time="0.000"></testcase>
140-
<testcase classname="dev" name="TestRecorderDriven/test" time="0.000"></testcase>
141-
<testcase classname="dev" name="TestRecorderDriven/test#01" time="0.000"></testcase>
131+
<testcase name="TestRecorderDriven" time="0.000"></testcase>
132+
<testcase name="TestRecorderDriven/builder" time="0.000"></testcase>
133+
<testcase name="TestRecorderDriven/builder#01" time="0.000"></testcase>
134+
<testcase name="TestRecorderDriven/dev-build" time="0.000"></testcase>
135+
<testcase name="TestRecorderDriven/dev-build#01" time="0.000"></testcase>
136+
<testcase name="TestRecorderDriven/generate" time="0.000"></testcase>
137+
<testcase name="TestRecorderDriven/generate#01" time="0.000"></testcase>
138+
<testcase name="TestRecorderDriven/lint" time="0.000"></testcase>
139+
<testcase name="TestRecorderDriven/lint#01" time="0.000"></testcase>
140+
<testcase name="TestRecorderDriven/test" time="0.000"></testcase>
141+
<testcase name="TestRecorderDriven/test#01" time="0.000"></testcase>
142142
</testsuite>
143143
</testsuites>`
144144
const xml2 = `<testsuites>
145145
<testsuite errors="0" failures="0" skipped="0" tests="6" time="0.010" name="github.com/cockroachdb/cockroach/pkg/cmd/dev.TestDataDriven" timestamp="2025-10-31T16:31:54.004Z">
146-
<testcase classname="dev" name="TestDataDriven" time="0.010"></testcase>
147-
<testcase classname="dev" name="TestDataDriven/bench" time="0.000"></testcase>
148-
<testcase classname="dev" name="TestDataDriven/dev-build" time="0.000"></testcase>
149-
<testcase classname="dev" name="TestDataDriven/generate" time="0.000"></testcase>
150-
<testcase classname="dev" name="TestDataDriven/testlogic" time="0.000"></testcase>
151-
<testcase classname="dev" name="TestDataDriven/ui" time="0.000"></testcase>
146+
<testcase name="TestDataDriven" time="0.010"></testcase>
147+
<testcase name="TestDataDriven/bench" time="0.000"></testcase>
148+
<testcase name="TestDataDriven/dev-build" time="0.000"></testcase>
149+
<testcase name="TestDataDriven/generate" time="0.000"></testcase>
150+
<testcase name="TestDataDriven/testlogic" time="0.000"></testcase>
151+
<testcase name="TestDataDriven/ui" time="0.000"></testcase>
152152
</testsuite>
153153
<testsuite errors="0" failures="0" skipped="0" tests="11" time="0.002" name="github.com/cockroachdb/cockroach/pkg/cmd/dev.TestRecorderDriven" timestamp="2025-10-31T16:31:54.010Z">
154-
<testcase classname="dev" name="TestRecorderDriven" time="0.000"></testcase>
155-
<testcase classname="dev" name="TestRecorderDriven/builder" time="0.000"></testcase>
156-
<testcase classname="dev" name="TestRecorderDriven/builder#01" time="0.000"></testcase>
157-
<testcase classname="dev" name="TestRecorderDriven/dev-build" time="0.000"></testcase>
158-
<testcase classname="dev" name="TestRecorderDriven/dev-build#01" time="0.000"></testcase>
159-
<testcase classname="dev" name="TestRecorderDriven/generate" time="0.000"></testcase>
160-
<testcase classname="dev" name="TestRecorderDriven/generate#01" time="0.000"></testcase>
161-
<testcase classname="dev" name="TestRecorderDriven/lint" time="0.000">
154+
<testcase name="TestRecorderDriven" time="0.000"></testcase>
155+
<testcase name="TestRecorderDriven/builder" time="0.000"></testcase>
156+
<testcase name="TestRecorderDriven/builder#01" time="0.000"></testcase>
157+
<testcase name="TestRecorderDriven/dev-build" time="0.000"></testcase>
158+
<testcase name="TestRecorderDriven/dev-build#01" time="0.000"></testcase>
159+
<testcase name="TestRecorderDriven/generate" time="0.000"></testcase>
160+
<testcase name="TestRecorderDriven/generate#01" time="0.000"></testcase>
161+
<testcase name="TestRecorderDriven/lint" time="0.000">
162162
<failure message="Failed" type="">FAILED ALSO</failure>
163163
</testcase>
164-
<testcase classname="dev" name="TestRecorderDriven/lint#01" time="0.000"></testcase>
165-
<testcase classname="dev" name="TestRecorderDriven/test" time="0.000"></testcase>
166-
<testcase classname="dev" name="TestRecorderDriven/test#01" time="0.000"></testcase>
164+
<testcase name="TestRecorderDriven/lint#01" time="0.000"></testcase>
165+
<testcase name="TestRecorderDriven/test" time="0.000"></testcase>
166+
<testcase name="TestRecorderDriven/test#01" time="0.000"></testcase>
167167
</testsuite>
168168
</testsuites>`
169169
const expected = `<testsuites>
170170
<testsuite errors="0" failures="1" skipped="0" tests="6" time="0.01" name="github.com/cockroachdb/cockroach/pkg/cmd/dev.TestDataDriven" timestamp="2025-10-31T16:31:54.004Z">
171-
<testcase classname="dev" name="TestDataDriven" time="0.010"></testcase>
172-
<testcase classname="dev" name="TestDataDriven/bench" time="0.000"></testcase>
173-
<testcase classname="dev" name="TestDataDriven/dev-build" time="0.000"></testcase>
174-
<testcase classname="dev" name="TestDataDriven/generate" time="0.000"></testcase>
175-
<testcase classname="dev" name="TestDataDriven/testlogic" time="0.000"></testcase>
176-
<testcase classname="dev" name="TestDataDriven/ui" time="0.000">
171+
<testcase name="TestDataDriven" time="0.010"></testcase>
172+
<testcase name="TestDataDriven/bench" time="0.000"></testcase>
173+
<testcase name="TestDataDriven/dev-build" time="0.000"></testcase>
174+
<testcase name="TestDataDriven/generate" time="0.000"></testcase>
175+
<testcase name="TestDataDriven/testlogic" time="0.000"></testcase>
176+
<testcase name="TestDataDriven/ui" time="0.000">
177177
<failure message="Failed" type="">FAILED</failure>
178178
</testcase>
179179
</testsuite>
180180
<testsuite errors="0" failures="1" skipped="0" tests="11" time="0.002" name="github.com/cockroachdb/cockroach/pkg/cmd/dev.TestRecorderDriven" timestamp="2025-10-31T16:31:54.010Z">
181-
<testcase classname="dev" name="TestRecorderDriven" time="0.000"></testcase>
182-
<testcase classname="dev" name="TestRecorderDriven/builder" time="0.000"></testcase>
183-
<testcase classname="dev" name="TestRecorderDriven/builder#01" time="0.000"></testcase>
184-
<testcase classname="dev" name="TestRecorderDriven/dev-build" time="0.000"></testcase>
185-
<testcase classname="dev" name="TestRecorderDriven/dev-build#01" time="0.000"></testcase>
186-
<testcase classname="dev" name="TestRecorderDriven/generate" time="0.000"></testcase>
187-
<testcase classname="dev" name="TestRecorderDriven/generate#01" time="0.000"></testcase>
188-
<testcase classname="dev" name="TestRecorderDriven/lint" time="0.000">
181+
<testcase name="TestRecorderDriven" time="0.000"></testcase>
182+
<testcase name="TestRecorderDriven/builder" time="0.000"></testcase>
183+
<testcase name="TestRecorderDriven/builder#01" time="0.000"></testcase>
184+
<testcase name="TestRecorderDriven/dev-build" time="0.000"></testcase>
185+
<testcase name="TestRecorderDriven/dev-build#01" time="0.000"></testcase>
186+
<testcase name="TestRecorderDriven/generate" time="0.000"></testcase>
187+
<testcase name="TestRecorderDriven/generate#01" time="0.000"></testcase>
188+
<testcase name="TestRecorderDriven/lint" time="0.000">
189189
<failure message="Failed" type="">FAILED ALSO</failure>
190190
</testcase>
191-
<testcase classname="dev" name="TestRecorderDriven/lint#01" time="0.000"></testcase>
192-
<testcase classname="dev" name="TestRecorderDriven/test" time="0.000"></testcase>
193-
<testcase classname="dev" name="TestRecorderDriven/test#01" time="0.000"></testcase>
191+
<testcase name="TestRecorderDriven/lint#01" time="0.000"></testcase>
192+
<testcase name="TestRecorderDriven/test" time="0.000"></testcase>
193+
<testcase name="TestRecorderDriven/test#01" time="0.000"></testcase>
194194
</testsuite>
195195
</testsuites>
196196
`
@@ -206,47 +206,47 @@ func TestMergeXml(t *testing.T) {
206206
func TestMungeTestXML(t *testing.T) {
207207
beforeXml := `<testsuites>
208208
<testsuite errors="0" failures="0" skipped="0" tests="6" time="0.010" name="github.com/cockroachdb/cockroach/pkg/cmd/dev.TestDataDriven" timestamp="2025-10-30T21:36:57.401Z">
209-
<testcase classname="dev" name="TestDataDriven" time="0.010"></testcase>
210-
<testcase classname="dev" name="TestDataDriven/bench" time="0.000"></testcase>
211-
<testcase classname="dev" name="TestDataDriven/dev-build" time="0.000"></testcase>
212-
<testcase classname="dev" name="TestDataDriven/generate" time="0.000"></testcase>
213-
<testcase classname="dev" name="TestDataDriven/testlogic" time="0.000"></testcase>
214-
<testcase classname="dev" name="TestDataDriven/ui" time="0.000"></testcase>
209+
<testcase name="TestDataDriven" time="0.010"></testcase>
210+
<testcase name="TestDataDriven/bench" time="0.000"></testcase>
211+
<testcase name="TestDataDriven/dev-build" time="0.000"></testcase>
212+
<testcase name="TestDataDriven/generate" time="0.000"></testcase>
213+
<testcase name="TestDataDriven/testlogic" time="0.000"></testcase>
214+
<testcase name="TestDataDriven/ui" time="0.000"></testcase>
215215
</testsuite>
216216
<testsuite errors="0" failures="0" skipped="0" tests="11" time="0.010" name="github.com/cockroachdb/cockroach/pkg/cmd/dev.TestRecorderDriven" timestamp="2025-10-30T21:36:57.406Z">
217-
<testcase classname="dev" name="TestRecorderDriven" time="0.000"></testcase>
218-
<testcase classname="dev" name="TestRecorderDriven/builder" time="0.000"></testcase>
219-
<testcase classname="dev" name="TestRecorderDriven/builder#01" time="0.000"></testcase>
220-
<testcase classname="dev" name="TestRecorderDriven/dev-build" time="0.000"></testcase>
221-
<testcase classname="dev" name="TestRecorderDriven/dev-build#01" time="0.000"></testcase>
222-
<testcase classname="dev" name="TestRecorderDriven/generate" time="0.000"></testcase>
223-
<testcase classname="dev" name="TestRecorderDriven/generate#01" time="0.000"></testcase>
224-
<testcase classname="dev" name="TestRecorderDriven/lint" time="0.000"></testcase>
225-
<testcase classname="dev" name="TestRecorderDriven/lint#01" time="0.000"></testcase>
226-
<testcase classname="dev" name="TestRecorderDriven/test" time="0.000"></testcase>
227-
<testcase classname="dev" name="TestRecorderDriven/test#01" time="0.000"></testcase>
217+
<testcase name="TestRecorderDriven" time="0.000"></testcase>
218+
<testcase name="TestRecorderDriven/builder" time="0.000"></testcase>
219+
<testcase name="TestRecorderDriven/builder#01" time="0.000"></testcase>
220+
<testcase name="TestRecorderDriven/dev-build" time="0.000"></testcase>
221+
<testcase name="TestRecorderDriven/dev-build#01" time="0.000"></testcase>
222+
<testcase name="TestRecorderDriven/generate" time="0.000"></testcase>
223+
<testcase name="TestRecorderDriven/generate#01" time="0.000"></testcase>
224+
<testcase name="TestRecorderDriven/lint" time="0.000"></testcase>
225+
<testcase name="TestRecorderDriven/lint#01" time="0.000"></testcase>
226+
<testcase name="TestRecorderDriven/test" time="0.000"></testcase>
227+
<testcase name="TestRecorderDriven/test#01" time="0.000"></testcase>
228228
</testsuite>
229229
</testsuites>
230230
`
231231

232232
expected := `<testsuite errors="0" failures="0" skipped="0" tests="17" time="0.02" name="github.com/cockroachdb/cockroach/pkg/cmd/dev" timestamp="2025-10-30T21:36:57.401Z">
233-
<testcase classname="dev" name="TestDataDriven" time="0.010"></testcase>
234-
<testcase classname="dev" name="TestDataDriven/bench" time="0.000"></testcase>
235-
<testcase classname="dev" name="TestDataDriven/dev-build" time="0.000"></testcase>
236-
<testcase classname="dev" name="TestDataDriven/generate" time="0.000"></testcase>
237-
<testcase classname="dev" name="TestDataDriven/testlogic" time="0.000"></testcase>
238-
<testcase classname="dev" name="TestDataDriven/ui" time="0.000"></testcase>
239-
<testcase classname="dev" name="TestRecorderDriven" time="0.000"></testcase>
240-
<testcase classname="dev" name="TestRecorderDriven/builder" time="0.000"></testcase>
241-
<testcase classname="dev" name="TestRecorderDriven/builder#01" time="0.000"></testcase>
242-
<testcase classname="dev" name="TestRecorderDriven/dev-build" time="0.000"></testcase>
243-
<testcase classname="dev" name="TestRecorderDriven/dev-build#01" time="0.000"></testcase>
244-
<testcase classname="dev" name="TestRecorderDriven/generate" time="0.000"></testcase>
245-
<testcase classname="dev" name="TestRecorderDriven/generate#01" time="0.000"></testcase>
246-
<testcase classname="dev" name="TestRecorderDriven/lint" time="0.000"></testcase>
247-
<testcase classname="dev" name="TestRecorderDriven/lint#01" time="0.000"></testcase>
248-
<testcase classname="dev" name="TestRecorderDriven/test" time="0.000"></testcase>
249-
<testcase classname="dev" name="TestRecorderDriven/test#01" time="0.000"></testcase>
233+
<testcase name="TestDataDriven" time="0.010"></testcase>
234+
<testcase name="TestDataDriven/bench" time="0.000"></testcase>
235+
<testcase name="TestDataDriven/dev-build" time="0.000"></testcase>
236+
<testcase name="TestDataDriven/generate" time="0.000"></testcase>
237+
<testcase name="TestDataDriven/testlogic" time="0.000"></testcase>
238+
<testcase name="TestDataDriven/ui" time="0.000"></testcase>
239+
<testcase name="TestRecorderDriven" time="0.000"></testcase>
240+
<testcase name="TestRecorderDriven/builder" time="0.000"></testcase>
241+
<testcase name="TestRecorderDriven/builder#01" time="0.000"></testcase>
242+
<testcase name="TestRecorderDriven/dev-build" time="0.000"></testcase>
243+
<testcase name="TestRecorderDriven/dev-build#01" time="0.000"></testcase>
244+
<testcase name="TestRecorderDriven/generate" time="0.000"></testcase>
245+
<testcase name="TestRecorderDriven/generate#01" time="0.000"></testcase>
246+
<testcase name="TestRecorderDriven/lint" time="0.000"></testcase>
247+
<testcase name="TestRecorderDriven/lint#01" time="0.000"></testcase>
248+
<testcase name="TestRecorderDriven/test" time="0.000"></testcase>
249+
<testcase name="TestRecorderDriven/test#01" time="0.000"></testcase>
250250
</testsuite>
251251
`
252252
var buf bytes.Buffer

0 commit comments

Comments
 (0)