fix junit reporter for parallel testing

JerryGinger · Jun 19, 2020 · fce3855 · fce3855
1 parent 749dbe7
commit fce3855
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/ginkgo_dsl.go b/ginkgo_dsl.go
@@ -191,13 +191,13 @@ type Benchmarker interface {
 //
 //	ginkgo bootstrap
 func RunSpecs(t GinkgoTestingT, description string) bool {
-	specReporters := []Reporter{buildDefaultReporter()}
+	var specReporters []Reporter
+
 	if config.DefaultReporterConfig.ReportFile != "" {
 		reportFile := config.DefaultReporterConfig.ReportFile
-		specReporters[0] = reporters.NewJUnitReporter(reportFile)
-		return RunSpecsWithDefaultAndCustomReporters(t, description, specReporters)
+		specReporters = append(specReporters, reporters.NewJUnitReporter(reportFile))
 	}
-	return RunSpecsWithCustomReporters(t, description, specReporters)
+	return RunSpecsWithDefaultAndCustomReporters(t, description, specReporters)
 }
 
 //To run your tests with Ginkgo's default reporter and your custom reporter(s), replace

diff --git a/reporters/junit_reporter.go b/reporters/junit_reporter.go
@@ -155,6 +155,13 @@ func (reporter *JUnitReporter) SpecSuiteDidEnd(summary *types.SuiteSummary) {
 	if err != nil {
 		fmt.Printf("\nFailed to create JUnit directory: %s\n\t%s", filePath, err.Error())
 	}
+
+	if config.GinkgoConfig.ParallelTotal > 1  {
+		ext := filepath.Ext(filePath)
+		filename := filePath[0:len(filePath)-len(ext)]
+		filePath = fmt.Sprintf("%s_%02d%s", filename, config.GinkgoConfig.ParallelNode, ext)
+	}
+
 	file, err := os.Create(filePath)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Failed to create JUnit report file: %s\n\t%s", filePath, err.Error())