Skip to content

Commit af9abc2

Browse files
committed
Use ginkgo v2 in tests
Signed-off-by: joshvanl <[email protected]>
1 parent 27789e1 commit af9abc2

File tree

14 files changed

+18
-620
lines changed

14 files changed

+18
-620
lines changed

go.mod

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/cert-manager/cert-manager v1.10.0
77
github.com/cert-manager/csi-lib v0.4.0
88
github.com/go-logr/logr v1.2.3
9-
github.com/onsi/ginkgo v1.16.5
9+
github.com/onsi/ginkgo/v2 v2.5.0
1010
github.com/onsi/gomega v1.24.0
1111
github.com/spf13/cobra v1.6.1
1212
github.com/spf13/pflag v1.0.5
@@ -24,7 +24,6 @@ require (
2424
)
2525

2626
require (
27-
cloud.google.com/go v0.105.0 // indirect
2827
cloud.google.com/go/compute v1.12.1 // indirect
2928
cloud.google.com/go/compute/metadata v0.2.1 // indirect
3029
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
@@ -34,8 +33,6 @@ require (
3433
github.com/Azure/go-autorest/logger v0.2.1 // indirect
3534
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
3635
github.com/Azure/go-ntlmssp v0.0.0-20220621081337-cb9428e4ac1e // indirect
37-
github.com/PuerkitoBio/purell v1.2.0 // indirect
38-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
3936
github.com/container-storage-interface/spec v1.7.0 // indirect
4037
github.com/davecgh/go-spew v1.1.1 // indirect
4138
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
@@ -56,7 +53,6 @@ require (
5653
github.com/google/gofuzz v1.2.0 // indirect
5754
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
5855
github.com/google/uuid v1.3.0 // indirect
59-
github.com/googleapis/gnostic v0.5.5 // indirect
6056
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
6157
github.com/imdario/mergo v0.3.13 // indirect
6258
github.com/inconshreveable/mousetrap v1.0.1 // indirect
@@ -71,8 +67,6 @@ require (
7167
github.com/modern-go/reflect2 v1.0.2 // indirect
7268
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
7369
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
74-
github.com/nxadm/tail v1.4.8 // indirect
75-
github.com/onsi/ginkgo/v2 v2.5.0 // indirect
7670
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
7771
github.com/pkg/errors v0.9.1 // indirect
7872
github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -90,7 +84,6 @@ require (
9084
google.golang.org/grpc v1.50.1 // indirect
9185
google.golang.org/protobuf v1.28.1 // indirect
9286
gopkg.in/inf.v0 v0.9.1 // indirect
93-
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
9487
gopkg.in/yaml.v2 v2.4.0 // indirect
9588
gopkg.in/yaml.v3 v3.0.1 // indirect
9689
k8s.io/apiextensions-apiserver v0.25.3 // indirect

go.sum

Lines changed: 3 additions & 579 deletions
Large diffs are not rendered by default.

test/e2e/framework/framework.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package framework
1919
import (
2020
"time"
2121

22-
. "github.com/onsi/ginkgo"
22+
. "github.com/onsi/ginkgo/v2"
2323
. "github.com/onsi/gomega"
2424

2525
cmmeta "github.com/cert-manager/cert-manager/pkg/apis/meta/v1"

test/e2e/framework/log/log.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"fmt"
2121
"time"
2222

23-
"github.com/onsi/ginkgo"
23+
"github.com/onsi/ginkgo/v2"
2424
)
2525

2626
var Writer = ginkgo.GinkgoWriter

test/e2e/framework/util.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"fmt"
2121
"time"
2222

23-
. "github.com/onsi/ginkgo"
23+
. "github.com/onsi/ginkgo/v2"
2424

2525
. "github.com/cert-manager/csi-driver/test/e2e/framework/log"
2626
)

test/e2e/suite/cases/fsgroup.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"context"
2121
"time"
2222

23-
. "github.com/onsi/ginkgo"
23+
. "github.com/onsi/ginkgo/v2"
2424
. "github.com/onsi/gomega"
2525
corev1 "k8s.io/api/core/v1"
2626
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

test/e2e/suite/cases/keyencoding.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"encoding/pem"
2323
"time"
2424

25-
. "github.com/onsi/ginkgo"
25+
. "github.com/onsi/ginkgo/v2"
2626
. "github.com/onsi/gomega"
2727

2828
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

test/e2e/suite/cases/pkcs12.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"time"
2222

2323
"github.com/cert-manager/cert-manager/pkg/util/pki"
24-
. "github.com/onsi/ginkgo"
24+
. "github.com/onsi/ginkgo/v2"
2525
. "github.com/onsi/gomega"
2626
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2727
"software.sslmate.com/src/go-pkcs12"

test/e2e/suite/cases/renew.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"fmt"
2323
"time"
2424

25-
. "github.com/onsi/ginkgo"
25+
. "github.com/onsi/ginkgo/v2"
2626
. "github.com/onsi/gomega"
2727

2828
corev1 "k8s.io/api/core/v1"

test/e2e/suite/cases/stress.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"fmt"
2222
"time"
2323

24-
. "github.com/onsi/ginkgo"
24+
. "github.com/onsi/ginkgo/v2"
2525
. "github.com/onsi/gomega"
2626

2727
cmapi "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"

0 commit comments

Comments
 (0)