Skip to content

Commit 19463f3

Browse files
porridgeporridge
authored
feat: support recursive testsuite elements (#23)
1 parent f69d8f5 commit 19463f3

File tree

3 files changed

+90
-7
lines changed

3 files changed

+90
-7
lines changed

‎main.go

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -405,12 +405,7 @@ func junit2csv(testSuites []junit.Suite, p params, output io.Writer) error {
405405
func (j junit2jira) findFailedTests(testSuites []junit.Suite) ([]testCase, error) {
406406
failedTests := make([]testCase, 0)
407407
for _, ts := range testSuites {
408-
for _, tc := range ts.Tests {
409-
if tc.Error == nil {
410-
continue
411-
}
412-
failedTests = j.addFailedTest(failedTests, tc)
413-
}
408+
failedTests = j.addFailedTests(ts, failedTests)
414409
}
415410
log.Infof("Found %d failed tests", len(failedTests))
416411

@@ -421,6 +416,19 @@ func (j junit2jira) findFailedTests(testSuites []junit.Suite) ([]testCase, error
421416
return failedTests, nil
422417
}
423418

419+
func (j junit2jira) addFailedTests(ts junit.Suite, failedTests []testCase) []testCase {
420+
for _, suite := range ts.Suites {
421+
failedTests = j.addFailedTests(suite, failedTests)
422+
}
423+
for _, tc := range ts.Tests {
424+
if tc.Error == nil {
425+
continue
426+
}
427+
failedTests = j.addTest(failedTests, tc)
428+
}
429+
return failedTests
430+
}
431+
424432
func (j junit2jira) mergeFailedTests(failedTests []testCase) ([]testCase, error) {
425433
log.Warning("Too many failed tests, reporting them as a one failure.")
426434
msg := ""
@@ -443,7 +451,7 @@ func (j junit2jira) mergeFailedTests(failedTests []testCase) ([]testCase, error)
443451
return []testCase{tc}, nil
444452
}
445453

446-
func (j junit2jira) addFailedTest(failedTests []testCase, tc junit.Test) []testCase {
454+
func (j junit2jira) addTest(failedTests []testCase, tc junit.Test) []testCase {
447455
if !isSubTest(tc) {
448456
return append(failedTests, NewTestCase(tc, j.params))
449457
}

‎main_test.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ github.com/stackrox/rox/sensor/kubernetes/localscanner / TestLocalScannerTLSIssu
7474
[]testCase{
7575
{
7676
Message: `DefaultPoliciesTest / Verify policy Apache Struts CVE-2017-5638 is triggered FAILED
77+
central-basic / step 90-activate-scanner-v4 FAILED
7778
github.com/stackrox/rox/pkg/booleanpolicy/evaluator / TestDifferentBaseTypes FAILED
7879
github.com/stackrox/rox/sensor/kubernetes/localscanner / TestLocalScannerTLSIssuerIntegrationTests FAILED
7980
github.com/stackrox/rox/central/resourcecollection/datastore/store/postgres / TestCollectionsStore FAILED
@@ -161,6 +162,13 @@ command-line-arguments / TestTimeout FAILED
161162
Error: "panic: test timed out after 1ns\n\ngoroutine 7 [running]:\ntesting.(*M).startAlarm.func1()\n\t/snap/go/10030/src/testing/testing.go:2036 +0x8e\ncreated by time.goFunc\n\t/snap/go/10030/src/time/sleep.go:176 +0x32\n\ngoroutine 1 [chan receive]:\ntesting.(*T).Run(0xc0000076c0, {0x5254af?, 0x4b7c05?}, 0x52f280)\n\t/snap/go/10030/src/testing/testing.go:1494 +0x37a\ntesting.runTests.func1(0xc00007e390?)\n\t/snap/go/10030/src/testing/testing.go:1846 +0x6e\ntesting.tRunner(0xc0000076c0, 0xc000104cd8)\n\t/snap/go/10030/src/testing/testing.go:1446 +0x10b\ntesting.runTests(0xc000000140?, {0x5fde10, 0x1, 0x1}, {0x7f398ed8a108?, 0x40?, 0x606c20?})\n\t/snap/go/10030/src/testing/testing.go:1844 +0x456\ntesting.(*M).Run(0xc000000140)\n\t/snap/go/10030/src/testing/testing.go:1726 +0x5d9\nmain.main()\n\t_testmain.go:47 +0x1aa\n\ngoroutine 6 [runnable]:\ntesting.pcToName(0x4b7dd4)\n\t/snap/go/10030/src/testing/testing.go:1226 +0x3d\ntesting.callerName(0x0?)\n\t/snap/go/10030/src/testing/testing.go:1222 +0x45\ntesting.tRunner(0xc000007860, 0x52f280)\n\t/snap/go/10030/src/testing/testing.go:1307 +0x34\ncreated by testing.(*T).Run\n\t/snap/go/10030/src/testing/testing.go:1493 +0x35f",
162163
BuildId: "1",
163164
},
165+
{
166+
Name: "step 90-activate-scanner-v4",
167+
Suite: "central-basic",
168+
Message: "failed in step 90-activate-scanner-v4",
169+
Error: "resource PersistentVolumeClaim:kuttl-test-apparent-gelding/scanner-v4-db: .spec.accessModes: value mismatch, expected: ReadWriteOncex != actual: ReadWriteOnce",
170+
BuildId: "1",
171+
},
164172
},
165173
tests,
166174
)

‎testdata/jira/kuttl-report.xml

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<testsuites name="" tests="0" failures="0" time="2115.358">
2+
<testsuite tests="0" failures="0" timestamp="2024-03-11T09:19:35.250138536+01:00" time="0.000" name="./tests/central">
3+
<testsuite tests="11" failures="0" timestamp="2024-03-11T09:19:35.257557888+01:00" time="" name="central-basic">
4+
<testcase classname="central-basic" name="setup" timestamp="2024-03-11T09:19:35.257558192+01:00" time="0.000" assertions="0"/>
5+
<testcase classname="central-basic" name="step 0-image-pull-secrets" timestamp="2024-03-11T09:19:35.546319474+01:00" time="0.000" assertions="0"/>
6+
<testcase classname="central-basic" name="step 10-central-cr" timestamp="2024-03-11T09:19:36.595834267+01:00" time="0.000" assertions="12"/>
7+
<testcase classname="central-basic" name="step 11-" timestamp="2024-03-11T09:22:50.907680332+01:00" time="0.000" assertions="3"/>
8+
<testcase classname="central-basic" name="step 20-verify-password" timestamp="2024-03-11T09:22:51.817070984+01:00" time="0.000" assertions="0"/>
9+
<testcase classname="central-basic" name="step 30-change-password" timestamp="2024-03-11T09:22:53.710940889+01:00" time="0.000" assertions="0"/>
10+
<testcase classname="central-basic" name="step 40-reconcile" timestamp="2024-03-11T09:22:54.471988804+01:00" time="0.000" assertions="2"/>
11+
<testcase classname="central-basic" name="step 60-use-new-password" timestamp="2024-03-11T09:24:27.54231141+01:00" time="0.000" assertions="0"/>
12+
<testcase classname="central-basic" name="step 75-switch-to-external-central-db" timestamp="2024-03-11T09:24:29.65030348+01:00" time="0.000" assertions="3"/>
13+
<testcase classname="central-basic" name="step 76-switch-back-to-internal-central-db" timestamp="2024-03-11T09:25:30.568030169+01:00" time="0.000" assertions="8"/>
14+
<testcase classname="central-basic" name="step 90-activate-scanner-v4" timestamp="2024-03-11T09:28:51.267096088+01:00" time="0.000" assertions="10">
15+
<failure message="failed in step 90-activate-scanner-v4" type="">resource PersistentVolumeClaim:kuttl-test-apparent-gelding/scanner-v4-db: .spec.accessModes: value mismatch, expected: ReadWriteOncex != actual: ReadWriteOnce</failure>
16+
</testcase>
17+
</testsuite>
18+
<testsuite tests="15" failures="0" timestamp="2024-03-11T09:19:35.261230002+01:00" time="" name="central-misc">
19+
<testcase classname="central-misc" name="setup" timestamp="2024-03-11T09:19:35.261230219+01:00" time="0.000" assertions="0"/>
20+
<testcase classname="central-misc" name="step 0-image-pull-secrets" timestamp="2024-03-11T09:19:35.526829403+01:00" time="0.000" assertions="0"/>
21+
<testcase classname="central-misc" name="step 10-central-cr" timestamp="2024-03-11T09:19:36.596963264+01:00" time="0.000" assertions="12"/>
22+
<testcase classname="central-misc" name="step 11-" timestamp="2024-03-11T09:23:09.391105115+01:00" time="0.000" assertions="1"/>
23+
<testcase classname="central-misc" name="step 40-enable-declarative-config" timestamp="2024-03-11T09:23:10.509766935+01:00" time="0.000" assertions="7"/>
24+
<testcase classname="central-misc" name="step 41-disable-declarative-config" timestamp="2024-03-11T09:24:43.52599129+01:00" time="0.000" assertions="7"/>
25+
<testcase classname="central-misc" name="step 61-set-expose-monitoring" timestamp="2024-03-11T09:26:05.0306941+01:00" time="0.000" assertions="10"/>
26+
<testcase classname="central-misc" name="step 62-" timestamp="2024-03-11T09:28:41.125375569+01:00" time="0.000" assertions="1"/>
27+
<testcase classname="central-misc" name="step 63-unset-expose-monitoring" timestamp="2024-03-11T09:28:42.090536955+01:00" time="0.000" assertions="10"/>
28+
<testcase classname="central-misc" name="step 64-" timestamp="2024-03-11T09:30:16.290671474+01:00" time="0.000" assertions="1"/>
29+
<testcase classname="central-misc" name="step 80-enable-telemetry" timestamp="2024-03-11T09:30:17.522745147+01:00" time="0.000" assertions="7"/>
30+
<testcase classname="central-misc" name="step 81-disable-telemetry" timestamp="2024-03-11T09:30:43.839958948+01:00" time="0.000" assertions="7"/>
31+
<testcase classname="central-misc" name="step 85-add-additional-ca" timestamp="2024-03-11T09:31:50.195464314+01:00" time="0.000" assertions="7"/>
32+
<testcase classname="central-misc" name="step 900-delete-cr" timestamp="2024-03-11T09:32:17.639280434+01:00" time="0.000" assertions="88"/>
33+
<testcase classname="central-misc" name="step 990-" timestamp="2024-03-11T09:33:08.988074197+01:00" time="0.000" assertions="10"/>
34+
</testsuite>
35+
</testsuite>
36+
<testsuite tests="0" failures="0" timestamp="2024-03-11T09:19:35.250178094+01:00" time="0.000" name="./tests/controller">
37+
<testsuite tests="3" failures="0" timestamp="2024-03-11T09:19:35.252150775+01:00" time="" name="metrics">
38+
<testcase classname="metrics" name="setup" timestamp="2024-03-11T09:19:35.252151087+01:00" time="0.000" assertions="0"/>
39+
<testcase classname="metrics" name="step 100-rbac" timestamp="2024-03-11T09:19:35.536421893+01:00" time="0.000" assertions="0"/>
40+
<testcase classname="metrics" name="step 200-access-no-auth" timestamp="2024-03-11T09:19:37.34609883+01:00" time="0.000" assertions="4"/>
41+
</testsuite>
42+
</testsuite>
43+
<testsuite tests="0" failures="0" timestamp="2024-03-11T09:19:35.250189349+01:00" time="0.000" name="./tests/securedcluster">
44+
<testsuite tests="20" failures="0" timestamp="2024-03-11T09:19:35.257858536+01:00" time="" name="sc-basic">
45+
<testcase classname="sc-basic" name="setup" timestamp="2024-03-11T09:19:35.257858714+01:00" time="0.000" assertions="0"/>
46+
<testcase classname="sc-basic" name="step 0-image-pull-secrets" timestamp="2024-03-11T09:19:35.528730355+01:00" time="0.000" assertions="0"/>
47+
<testcase classname="sc-basic" name="step 5-central-cr" timestamp="2024-03-11T09:19:36.586298814+01:00" time="0.000" assertions="6"/>
48+
<testcase classname="sc-basic" name="step 7-fetch-bundle" timestamp="2024-03-11T09:22:14.172876559+01:00" time="0.000" assertions="3"/>
49+
<testcase classname="sc-basic" name="step 10-secured-cluster-cr" timestamp="2024-03-11T09:22:19.133516061+01:00" time="0.000" assertions="5"/>
50+
<testcase classname="sc-basic" name="step 12-" timestamp="2024-03-11T09:23:31.889693826+01:00" time="0.000" assertions="0"/>
51+
<testcase classname="sc-basic" name="step 13-" timestamp="2024-03-11T09:23:31.889764064+01:00" time="0.000" assertions="0"/>
52+
<testcase classname="sc-basic" name="step 14-" timestamp="2024-03-11T09:23:31.889797675+01:00" time="0.000" assertions="0"/>
53+
<testcase classname="sc-basic" name="step 15-" timestamp="2024-03-11T09:23:31.889831734+01:00" time="0.000" assertions="0"/>
54+
<testcase classname="sc-basic" name="step 16-" timestamp="2024-03-11T09:23:31.889880701+01:00" time="0.000" assertions="0"/>
55+
<testcase classname="sc-basic" name="step 20-try-change-cluster-name" timestamp="2024-03-11T09:23:31.889904131+01:00" time="0.000" assertions="1"/>
56+
<testcase classname="sc-basic" name="step 30-change-cluster-name-back" timestamp="2024-03-11T09:23:32.933877824+01:00" time="0.000" assertions="5"/>
57+
<testcase classname="sc-basic" name="step 40-enable-monitoring" timestamp="2024-03-11T09:23:55.205576704+01:00" time="0.000" assertions="1"/>
58+
<testcase classname="sc-basic" name="step 41-" timestamp="2024-03-11T09:23:57.721971599+01:00" time="0.000" assertions="5"/>
59+
<testcase classname="sc-basic" name="step 42-disable-monitoring" timestamp="2024-03-11T09:23:59.744647568+01:00" time="0.000" assertions="1"/>
60+
<testcase classname="sc-basic" name="step 43-" timestamp="2024-03-11T09:25:02.021906203+01:00" time="0.000" assertions="5"/>
61+
<testcase classname="sc-basic" name="step 900-delete-central-cr" timestamp="2024-03-11T09:25:21.262558079+01:00" time="0.000" assertions="2"/>
62+
<testcase classname="sc-basic" name="step 910-" timestamp="2024-03-11T09:26:07.586210014+01:00" time="0.000" assertions="1"/>
63+
<testcase classname="sc-basic" name="step 950-delete-secured-cluster-cr" timestamp="2024-03-11T09:27:04.476050533+01:00" time="0.000" assertions="71"/>
64+
<testcase classname="sc-basic" name="step 990-" timestamp="2024-03-11T09:27:30.877137376+01:00" time="0.000" assertions="10"/>
65+
</testsuite>
66+
</testsuite>
67+
</testsuites>

0 commit comments

Comments
 (0)