diff --git a/go.mod b/go.mod index a64a2440b..b156c005c 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/navidys/tvxwidgets v0.14.0 github.com/netobserv/flowlogs-pipeline v1.12.0-community.0.20260901145451-c8613bab4412 github.com/netobserv/netobserv-ebpf-agent v1.12.0-community - 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/openshift/api v0.0.0-20260619095050-5346161d1bf2 github.com/openshift/library-go v0.0.0-20260625074842-d80d43df888c diff --git a/go.sum b/go.sum index 54db88136..48f1296a9 100644 --- a/go.sum +++ b/go.sum @@ -160,8 +160,8 @@ github.com/netobserv/flowlogs-pipeline v1.12.0-community.0.20260901145451-c8613b github.com/netobserv/flowlogs-pipeline v1.12.0-community.0.20260901145451-c8613bab4412/go.mod h1:YzMTZNX5y/uwtvwPuNXLpi0T4cMOyuEeA03zt555KDM= github.com/netobserv/netobserv-ebpf-agent v1.12.0-community h1:3e18pZzZPjRSm9TPECquVFf/4ntSjpVrb32pmJ8sAT8= github.com/netobserv/netobserv-ebpf-agent v1.12.0-community/go.mod h1:ML3ApiUVk+ROiB/oJ6v48PxIVhE9hAt955+oE+q20JM= -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/openshift/api v0.0.0-20260619095050-5346161d1bf2 h1:oZkYkIvQHkQV8pN0oe8AfPfc7y9+svwmsQHwbOWyJBw= diff --git a/vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md b/vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md index 4d1ed9523..45fa53434 100644 --- a/vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md +++ b/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 diff --git a/vendor/github.com/onsi/ginkgo/v2/internal/parallel_support/server_handler.go b/vendor/github.com/onsi/ginkgo/v2/internal/parallel_support/server_handler.go index ab9e11372..360606517 100644 --- a/vendor/github.com/onsi/ginkgo/v2/internal/parallel_support/server_handler.go +++ b/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 } } diff --git a/vendor/github.com/onsi/ginkgo/v2/types/version.go b/vendor/github.com/onsi/ginkgo/v2/types/version.go index 177baed9b..a34f1f3a3 100644 --- a/vendor/github.com/onsi/ginkgo/v2/types/version.go +++ b/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" diff --git a/vendor/modules.txt b/vendor/modules.txt index eeb00c565..c3359e526 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -205,7 +205,7 @@ github.com/netobserv/flowlogs-pipeline/pkg/utils ## explicit; go 1.25.7 github.com/netobserv/netobserv-ebpf-agent/pkg/utils github.com/netobserv/netobserv-ebpf-agent/pkg/utils/networkevents -# 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