Merge pull request #534 from sudo-bmitch/pr-junit-reporter

Conformance: remove labels from junit reporter output

Author: sudo-bmitch

conformance/00_conformance_suite_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	g "github.com/onsi/ginkgo/v2"
+	"github.com/onsi/ginkgo/v2/reporters"
 	. "github.com/onsi/gomega"
 )
 
@@ -18,13 +19,19 @@ func TestConformance(t *testing.T) {
 
 	RegisterFailHandler(g.Fail)
 	suiteConfig, reporterConfig := g.GinkgoConfiguration()
-	reporterConfig.JUnitReport = reportJUnitFilename
 	hr := newHTMLReporter(reportHTMLFilename)
 	g.ReportAfterEach(hr.afterReport)
 	g.ReportAfterSuite("html custom reporter", func(r g.Report) {
 		if err := hr.endSuite(r); err != nil {
 			log.Printf("\nWARNING: cannot write HTML summary report: %v", err)
 		}
 	})
+	g.ReportAfterSuite("junit custom reporter", func(r g.Report) {
+		if reportJUnitFilename != "" {
+			_ = reporters.GenerateJUnitReportWithConfig(r, reportJUnitFilename, reporters.JunitReportConfig{
+				OmitLeafNodeType: true,
+			})
+		}
+	})
 	g.RunSpecs(t, "conformance tests", suiteConfig, reporterConfig)
 }