From dc964b5777b673ff04e01d1e44d45616a4fe9965 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Jan 2026 19:22:43 +0000 Subject: [PATCH] Bump github.com/onsi/ginkgo/v2 from 2.27.2 to 2.27.5 in /src/acceptance Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.27.2 to 2.27.5. - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](https://github.com/onsi/ginkgo/compare/v2.27.2...v2.27.5) --- updated-dependencies: - dependency-name: github.com/onsi/ginkgo/v2 dependency-version: 2.27.5 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- src/acceptance/go.mod | 2 +- src/acceptance/go.sum | 4 ++-- .../github.com/onsi/ginkgo/v2/CHANGELOG.md | 16 ++++++++++++++++ .../onsi/ginkgo/v2/ginkgo/internal/run.go | 13 ++++++++++++- .../github.com/onsi/ginkgo/v2/internal/suite.go | 5 ++++- .../v2/internal/testingtproxy/testing_t_proxy.go | 7 ++++++- .../github.com/onsi/ginkgo/v2/types/version.go | 2 +- src/acceptance/vendor/modules.txt | 4 ++-- 8 files changed, 44 insertions(+), 9 deletions(-) diff --git a/src/acceptance/go.mod b/src/acceptance/go.mod index c09de4fb..9342860e 100644 --- a/src/acceptance/go.mod +++ b/src/acceptance/go.mod @@ -6,7 +6,7 @@ require ( bitbucket.org/chrj/smtpd v0.0.0-20170817182725-9ddcdbda0f7a github.com/cloudfoundry/notifications-release/src/notifications/v81 v81.0.0 github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d - github.com/onsi/ginkgo/v2 v2.27.2 + github.com/onsi/ginkgo/v2 v2.27.5 github.com/onsi/gomega v1.39.0 github.com/pivotal-cf-experimental/warrant v0.0.0-20211122194707-17385443920f ) diff --git a/src/acceptance/go.sum b/src/acceptance/go.sum index d17984f4..84469518 100644 --- a/src/acceptance/go.sum +++ b/src/acceptance/go.sum @@ -50,8 +50,8 @@ github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+ github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/ginkgo/v2 v2.27.2 h1:LzwLj0b89qtIy6SSASkzlNvX6WktqurSHwkk2ipF/Ns= -github.com/onsi/ginkgo/v2 v2.27.2/go.mod h1:ArE1D/XhNXBXCBkKOLkbsb2c81dQHCRcF5zwn/ykDRo= +github.com/onsi/ginkgo/v2 v2.27.5 h1:ZeVgZMx2PDMdJm/+w5fE/OyG6ILo1Y3e+QX4zSR0zTE= +github.com/onsi/ginkgo/v2 v2.27.5/go.mod h1:ArE1D/XhNXBXCBkKOLkbsb2c81dQHCRcF5zwn/ykDRo= github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.39.0 h1:y2ROC3hKFmQZJNFeGAMeHZKkjBL65mIZcvrLQBF9k6Q= github.com/onsi/gomega v1.39.0/go.mod h1:ZCU1pkQcXDO5Sl9/VVEGlDyp+zm0m1cmeG5TOzLgdh4= diff --git a/src/acceptance/vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md b/src/acceptance/vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md index 09217941..dd35aa1c 100644 --- a/src/acceptance/vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md +++ b/src/acceptance/vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md @@ -1,3 +1,19 @@ +## 2.27.5 + +### Fixes +Don't make a new formatter for each GinkgoT(); that's just silly and uses precious memory + +## 2.27.4 + +### Fixes +- CurrentTreeConstructionNodeReport: fix for nested container nodes [59bc751] + +## 2.27.3 + +### Fixes +report exit result in case of failure [1c9f356] +fix data race [ece19c8] + ## 2.27.2 ### Fixes diff --git a/src/acceptance/vendor/github.com/onsi/ginkgo/v2/ginkgo/internal/run.go b/src/acceptance/vendor/github.com/onsi/ginkgo/v2/ginkgo/internal/run.go index 30d8096c..48c69a1d 100644 --- a/src/acceptance/vendor/github.com/onsi/ginkgo/v2/ginkgo/internal/run.go +++ b/src/acceptance/vendor/github.com/onsi/ginkgo/v2/ginkgo/internal/run.go @@ -9,6 +9,7 @@ import ( "path/filepath" "regexp" "strings" + "sync/atomic" "syscall" "time" @@ -159,12 +160,15 @@ func runSerial(suite TestSuite, ginkgoConfig types.SuiteConfig, reporterConfig t func runParallel(suite TestSuite, ginkgoConfig types.SuiteConfig, reporterConfig types.ReporterConfig, cliConfig types.CLIConfig, goFlagsConfig types.GoFlagsConfig, additionalArgs []string) TestSuite { type procResult struct { + proc int + exitResult string passed bool hasProgrammaticFocus bool } numProcs := cliConfig.ComputedProcs() procOutput := make([]*bytes.Buffer, numProcs) + procExitResult := make([]string, numProcs) coverProfiles := []string{} blockProfiles := []string{} @@ -224,16 +228,20 @@ func runParallel(suite TestSuite, ginkgoConfig types.SuiteConfig, reporterConfig args = append(args, additionalArgs...) cmd, buf := buildAndStartCommand(suite, args, false) + var exited atomic.Bool procOutput[proc-1] = buf - server.RegisterAlive(proc, func() bool { return cmd.ProcessState == nil || !cmd.ProcessState.Exited() }) + server.RegisterAlive(proc, func() bool { return !exited.Load() }) go func() { cmd.Wait() exitStatus := cmd.ProcessState.Sys().(syscall.WaitStatus).ExitStatus() procResults <- procResult{ + proc: proc, + exitResult: cmd.ProcessState.String(), passed: (exitStatus == 0) || (exitStatus == types.GINKGO_FOCUS_EXIT_CODE), hasProgrammaticFocus: exitStatus == types.GINKGO_FOCUS_EXIT_CODE, } + exited.Store(true) }() } @@ -242,6 +250,7 @@ func runParallel(suite TestSuite, ginkgoConfig types.SuiteConfig, reporterConfig result := <-procResults passed = passed && result.passed suite.HasProgrammaticFocus = suite.HasProgrammaticFocus || result.hasProgrammaticFocus + procExitResult[result.proc-1] = result.exitResult } if passed { suite.State = TestSuiteStatePassed @@ -261,6 +270,8 @@ func runParallel(suite TestSuite, ginkgoConfig types.SuiteConfig, reporterConfig for proc := 1; proc <= cliConfig.ComputedProcs(); proc++ { fmt.Fprintf(formatter.ColorableStdErr, formatter.F("{{bold}}Output from proc %d:{{/}}\n", proc)) fmt.Fprintln(os.Stderr, formatter.Fi(1, "%s", procOutput[proc-1].String())) + fmt.Fprintf(formatter.ColorableStdErr, formatter.F("{{bold}}Exit result of proc %d:{{/}}\n", proc)) + fmt.Fprintln(os.Stderr, formatter.Fi(1, "%s\n", procExitResult[proc-1])) } fmt.Fprintf(os.Stderr, "** End **") } diff --git a/src/acceptance/vendor/github.com/onsi/ginkgo/v2/internal/suite.go b/src/acceptance/vendor/github.com/onsi/ginkgo/v2/internal/suite.go index ef76cd09..9d5f5900 100644 --- a/src/acceptance/vendor/github.com/onsi/ginkgo/v2/internal/suite.go +++ b/src/acceptance/vendor/github.com/onsi/ginkgo/v2/internal/suite.go @@ -208,9 +208,12 @@ func (suite *Suite) PushNode(node Node) error { // Ensure that code running in the body of the container node // has access to information about the current container node(s). + // The current one (nil in top-level container nodes, non-nil in an + // embedded container node) gets restored when the node is done. + oldConstructionNodeReport := suite.currentConstructionNodeReport suite.currentConstructionNodeReport = constructionNodeReportForTreeNode(suite.tree) defer func() { - suite.currentConstructionNodeReport = nil + suite.currentConstructionNodeReport = oldConstructionNodeReport }() node.Body(nil) diff --git a/src/acceptance/vendor/github.com/onsi/ginkgo/v2/internal/testingtproxy/testing_t_proxy.go b/src/acceptance/vendor/github.com/onsi/ginkgo/v2/internal/testingtproxy/testing_t_proxy.go index 9806e315..5704f0fd 100644 --- a/src/acceptance/vendor/github.com/onsi/ginkgo/v2/internal/testingtproxy/testing_t_proxy.go +++ b/src/acceptance/vendor/github.com/onsi/ginkgo/v2/internal/testingtproxy/testing_t_proxy.go @@ -27,6 +27,11 @@ type ginkgoWriterInterface interface { type ginkgoRecoverFunc func() type attachProgressReporterFunc func(func() string) func() +var formatters = map[bool]formatter.Formatter{ + true: formatter.NewWithNoColorBool(true), + false: formatter.NewWithNoColorBool(false), +} + func New(writer ginkgoWriterInterface, fail failFunc, skip skipFunc, cleanup cleanupFunc, report reportFunc, addReportEntry addReportEntryFunc, ginkgoRecover ginkgoRecoverFunc, attachProgressReporter attachProgressReporterFunc, randomSeed int64, parallelProcess int, parallelTotal int, noColor bool, offset int) *ginkgoTestingTProxy { return &ginkgoTestingTProxy{ fail: fail, @@ -41,7 +46,7 @@ func New(writer ginkgoWriterInterface, fail failFunc, skip skipFunc, cleanup cle randomSeed: randomSeed, parallelProcess: parallelProcess, parallelTotal: parallelTotal, - f: formatter.NewWithNoColorBool(noColor), + f: formatters[noColor], //minimize allocations by reusing formatters } } diff --git a/src/acceptance/vendor/github.com/onsi/ginkgo/v2/types/version.go b/src/acceptance/vendor/github.com/onsi/ginkgo/v2/types/version.go index b9c1ea98..72fb8ec3 100644 --- a/src/acceptance/vendor/github.com/onsi/ginkgo/v2/types/version.go +++ b/src/acceptance/vendor/github.com/onsi/ginkgo/v2/types/version.go @@ -1,3 +1,3 @@ package types -const VERSION = "2.27.2" +const VERSION = "2.27.5" diff --git a/src/acceptance/vendor/modules.txt b/src/acceptance/vendor/modules.txt index 98dd4850..1aa040c4 100644 --- a/src/acceptance/vendor/modules.txt +++ b/src/acceptance/vendor/modules.txt @@ -5,7 +5,7 @@ bitbucket.org/chrj/smtpd ## explicit; go 1.21 github.com/Masterminds/semver/v3 # github.com/cloudfoundry/notifications-release/src/notifications/v81 v81.0.0 => ../notifications -## explicit; go 1.25.5 +## explicit; go 1.25.6 github.com/cloudfoundry/notifications-release/src/notifications/v81/v1/acceptance/support # github.com/go-logr/logr v1.4.3 ## explicit; go 1.18 @@ -32,7 +32,7 @@ github.com/google/pprof/profile github.com/nu7hatch/gouuid # github.com/nxadm/tail v1.4.8 ## explicit; go 1.13 -# github.com/onsi/ginkgo/v2 v2.27.2 +# github.com/onsi/ginkgo/v2 v2.27.5 ## explicit; go 1.23.0 github.com/onsi/ginkgo/v2 github.com/onsi/ginkgo/v2/config