Skip to content

Commit de8e6ae

Browse files
anishasthanaopenshift-merge-robot
authored andcommitted
Update Ginkgo version to v2
Signed-off-by: Anish Asthana <[email protected]>
1 parent 0089e9e commit de8e6ae

File tree

4 files changed

+5
-8
lines changed

4 files changed

+5
-8
lines changed

controllers/mcad_controller_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
mfc "github.com/manifestival/controller-runtime-client"
66
mf "github.com/manifestival/manifestival"
7-
. "github.com/onsi/ginkgo"
7+
. "github.com/onsi/ginkgo/v2"
88
. "github.com/onsi/gomega"
99
codeflarev1alpha1 "github.com/project-codeflare/codeflare-operator/api/v1alpha1"
1010
"github.com/project-codeflare/codeflare-operator/controllers/testutil"

controllers/suite_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"testing"
2424
"time"
2525

26-
. "github.com/onsi/ginkgo"
26+
. "github.com/onsi/ginkgo/v2"
2727
. "github.com/onsi/gomega"
2828

2929
mf "github.com/manifestival/manifestival"
@@ -60,7 +60,7 @@ const (
6060
func TestAPIs(t *testing.T) {
6161
RegisterFailHandler(Fail)
6262

63-
RunSpecs(t, "Controller Suite")
63+
RunSpecs(t, "Controllers Suite")
6464
}
6565

6666
var _ = BeforeSuite(func() {
@@ -118,7 +118,7 @@ var _ = BeforeSuite(func() {
118118
Expect(err).ToNot(HaveOccurred(), "Failed to run manager")
119119
}()
120120

121-
}, 60)
121+
})
122122

123123
var _ = AfterSuite(func() {
124124
// Give some time to allow workers to gracefully shutdown

go.mod

+1-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/go-logr/logr v1.2.2
77
github.com/manifestival/controller-runtime-client v0.4.0
88
github.com/manifestival/manifestival v0.7.2
9-
github.com/onsi/ginkgo v1.16.5
9+
github.com/onsi/ginkgo/v2 v2.0.0
1010
github.com/onsi/gomega v1.18.1
1111
go.uber.org/zap v1.19.1
1212
k8s.io/api v0.24.2
@@ -52,7 +52,6 @@ require (
5252
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5353
github.com/modern-go/reflect2 v1.0.2 // indirect
5454
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
55-
github.com/nxadm/tail v1.4.8 // indirect
5655
github.com/pkg/errors v0.9.1 // indirect
5756
github.com/prometheus/client_golang v1.12.1 // indirect
5857
github.com/prometheus/client_model v0.2.0 // indirect
@@ -72,7 +71,6 @@ require (
7271
google.golang.org/appengine v1.6.7 // indirect
7372
google.golang.org/protobuf v1.27.1 // indirect
7473
gopkg.in/inf.v0 v0.9.1 // indirect
75-
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
7674
gopkg.in/yaml.v2 v2.4.0 // indirect
7775
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
7876
k8s.io/apiextensions-apiserver v0.24.2 // indirect

go.sum

-1
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,6 @@ github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9k
496496
github.com/onsi/ginkgo v1.14.1/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
497497
github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
498498
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
499-
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
500499
github.com/onsi/ginkgo/v2 v2.0.0 h1:CcuG/HvWNkkaqCUpJifQY8z7qEMBJya6aLPx6ftGyjQ=
501500
github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
502501
github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=

0 commit comments

Comments
 (0)