Merge pull request #29742 from podman-container-tools/renovate/github.com-onsi-ginkgo-v2-2.x

Update module github.com/onsi/ginkgo/v2 to v2.32.2

go.mod

@@ -46,7 +46,7 @@ require (
 	github.com/moby/sys/user v0.4.1
 	github.com/moby/term v0.5.2
 	github.com/nxadm/tail v1.4.11
-	github.com/onsi/ginkgo/v2 v2.32.1
+	github.com/onsi/ginkgo/v2 v2.32.2
 	github.com/onsi/gomega v1.43.0
 	github.com/opencontainers/cgroups v0.1.0
 	github.com/opencontainers/go-digest v1.0.0

go.sum

@@ -281,8 +281,8 @@ github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee h1:W5t00kpgFd
 github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/nxadm/tail v1.4.11 h1:8feyoE3OzPrcshW5/MJ4sGESc5cqmGkGCWlco4l0bqY=
 github.com/nxadm/tail v1.4.11/go.mod h1:OTaG3NK980DZzxbRq6lEuzgU+mug70nY11sMd4JXXHc=
-github.com/onsi/ginkgo/v2 v2.32.1 h1:6tlvcDm/3sE8lGJbZ4+d4mO3RLy24/tQWOFzVSQNIfw=
-github.com/onsi/ginkgo/v2 v2.32.1/go.mod h1:+aXOY+vzZ5mu2iI2HpTZUPmM//oQfsNFX6gU9kNcA44=
+github.com/onsi/ginkgo/v2 v2.32.2 h1:2o6vyFvR6snrJWgRVztC+OwuqqPEMI1UzYl2s2iU7Cg=
+github.com/onsi/ginkgo/v2 v2.32.2/go.mod h1:+aXOY+vzZ5mu2iI2HpTZUPmM//oQfsNFX6gU9kNcA44=
 github.com/onsi/gomega v1.43.0 h1:VlG/1FxqNxhSO+lq/OHBNaaqwiBK/mO8JbVkX9Y+FeU=
 github.com/onsi/gomega v1.43.0/go.mod h1:REff/hsDsodHoKlWsP2mAPhu1+5/6hVYNf9rIEBpeSg=
 github.com/opencontainers/cgroups v0.1.0 h1:6W05KiDvgj1yi/6D13SJCvYx8TAESz67szvHPxhfcrs=

vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.32.2
+
+### Fixes
+- fix bug where ginkgo -race -p was taking extra long to exit [c6792b0]
+
 ## 2.32.1
 
 ### Fixes

vendor/github.com/onsi/ginkgo/v2/internal/parallel_support/server_handler.go

@@ -32,6 +32,7 @@ type ServerHandler struct {
 
 	numSuiteDidBegins int
 	numSuiteDidEnds   int
+	procDidEnd        []bool
 	aggregatedReport  types.Report
 	reportHoldingArea []types.SpecReport
 }
@@ -42,6 +43,7 @@ func newServerHandler(parallelTotal int, reporter reporters.Reporter) *ServerHan
 		lock:             &sync.Mutex{},
 		counterLock:      &sync.Mutex{},
 		alives:           make([]func() bool, parallelTotal),
+		procDidEnd:       make([]bool, parallelTotal),
 		beforeSuiteState: BeforeSuiteState{Data: nil, State: types.SpecStateInvalid},
 
 		parallelTotal:     parallelTotal,
@@ -90,6 +92,9 @@ func (handler *ServerHandler) SpecSuiteDidEnd(report types.Report, _ *Void) erro
 	defer handler.lock.Unlock()
 
 	handler.numSuiteDidEnds += 1
+	if proc := report.SuiteConfig.ParallelProcess; proc >= 1 && proc <= handler.parallelTotal {
+		handler.procDidEnd[proc-1] = true
+	}
 	if handler.numSuiteDidEnds == 1 {
 		handler.aggregatedReport = report
 	} else {
@@ -133,9 +138,17 @@ func (handler *ServerHandler) procIsAlive(proc int) bool {
 	return alive()
 }
 
+func (handler *ServerHandler) procHasFinished(proc int) bool {
+	handler.lock.Lock()
+	didEnd := handler.procDidEnd[proc-1]
+	handler.lock.Unlock()
+
+	return didEnd || !handler.procIsAlive(proc)
+}
+
 func (handler *ServerHandler) haveNonprimaryProcsFinished() bool {
 	for i := 2; i <= handler.parallelTotal; i++ {
-		if handler.procIsAlive(i) {
+		if !handler.procHasFinished(i) {
 			return false
 		}
 	}

vendor/github.com/onsi/ginkgo/v2/types/version.go

@@ -1,3 +1,3 @@
 package types
 
-const VERSION = "2.32.1"
+const VERSION = "2.32.2"

vendor/modules.txt

@@ -474,7 +474,7 @@ github.com/nxadm/tail/ratelimiter
 github.com/nxadm/tail/util
 github.com/nxadm/tail/watch
 github.com/nxadm/tail/winfile
-# github.com/onsi/ginkgo/v2 v2.32.1
+# github.com/onsi/ginkgo/v2 v2.32.2
 ## explicit; go 1.25.0
 github.com/onsi/ginkgo/v2
 github.com/onsi/ginkgo/v2/config