fix: install ginkgo v2 CLI and fix bare DeferCleanup in supply_test

ramonskie · ramonskie · commit ebe07ebd0634 · 2026-03-02T17:30:36.000+01:00
- Update ginkgo install path to github.com/onsi/ginkgo/v2/ginkgo
- Wrap bare DeferCleanup in BeforeEach in HandlePylibmc Describe block;
  DeferCleanup must be called inside a setup node, not a container node.
diff --git a/scripts/.util/tools.sh b/scripts/.util/tools.sh
@@ -40,7 +40,7 @@ function util::tools::ginkgo::install() {
     pushd /tmp > /dev/null || return
       GOBIN="${dir}" \
         go install \
-          github.com/onsi/ginkgo/ginkgo@latest
+          github.com/onsi/ginkgo/v2/ginkgo@latest
     popd > /dev/null || return
   fi
 }
diff --git a/src/python/supply/supply_test.go b/src/python/supply/supply_test.go
@@ -295,7 +295,9 @@ var _ = Describe("Supply", func() {
 	})
 
 	Describe("HandlePylibmc", func() {
-		DeferCleanup(os.Setenv, "LIBMEMCACHED", "")
+		BeforeEach(func() {
+			DeferCleanup(os.Setenv, "LIBMEMCACHED", "")
+		})
 
 		Context("when the app uses pylibmc", func() {
 			BeforeEach(func() {

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ function util::tools::ginkgo::install() {`
`40`	`40`	`pushd /tmp > /dev/null \|\| return`
`41`	`41`	`GOBIN="${dir}" \`
`42`	`42`	`go install \`
`43`		`- github.com/onsi/ginkgo/ginkgo@latest`
	`43`	`+ github.com/onsi/ginkgo/v2/ginkgo@latest`
`44`	`44`	`popd > /dev/null \|\| return`
`45`	`45`	`fi`
`46`	`46`	`}`