Skip to content

Commit 4458150

Browse files
committed
update to ginkgo v2
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
1 parent 3f5f906 commit 4458150

File tree

558 files changed

+38607
-19614
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

558 files changed

+38607
-19614
lines changed

go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ require (
4242
github.com/mattn/go-sqlite3 v1.14.16
4343
github.com/moby/term v0.0.0-20230430223545-0564e01cfe5d
4444
github.com/nxadm/tail v1.4.8
45-
github.com/onsi/ginkgo v1.16.5
45+
github.com/onsi/ginkgo/v2 v2.9.2
4646
github.com/onsi/gomega v1.27.6
4747
github.com/opencontainers/go-digest v1.0.0
4848
github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b
@@ -110,12 +110,14 @@ require (
110110
github.com/go-playground/locales v0.14.1 // indirect
111111
github.com/go-playground/universal-translator v0.18.1 // indirect
112112
github.com/go-playground/validator/v10 v10.12.0 // indirect
113+
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
113114
github.com/gogo/protobuf v1.3.2 // indirect
114115
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
115116
github.com/golang/protobuf v1.5.3 // indirect
116117
github.com/google/go-cmp v0.5.9 // indirect
117118
github.com/google/go-containerregistry v0.13.0 // indirect
118119
github.com/google/go-intervals v0.0.2 // indirect
120+
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
119121
github.com/google/trillian v1.5.1 // indirect
120122
github.com/hashicorp/errwrap v1.1.0 // indirect
121123
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect

go.sum

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,6 +445,7 @@ github.com/go-rod/rod v0.112.6 h1:zMirUmhsBeshMWyf285BD0UGtGq54HfThLDGSjcP3lU=
445445
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
446446
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
447447
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
448+
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
448449
github.com/go-test/deep v1.1.0 h1:WOcxcdHcvdgThNXjw0t76K42FXTU7HpNQWHpA2HHNlg=
449450
github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0=
450451
github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY=
@@ -768,9 +769,9 @@ github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0
768769
github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
769770
github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
770771
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
771-
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
772772
github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
773773
github.com/onsi/ginkgo/v2 v2.9.2 h1:BA2GMJOtfGAfagzYtrAlufIP0lq6QERkFmHLMLPwFSU=
774+
github.com/onsi/ginkgo/v2 v2.9.2/go.mod h1:WHcJJG2dIlcCqVfBAwUCrJxSPFb6v4azBwgxeMeDuts=
774775
github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
775776
github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
776777
github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=

pkg/bindings/test/attach_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/containers/podman/v4/libpod/define"
99
"github.com/containers/podman/v4/pkg/bindings/containers"
1010
"github.com/containers/podman/v4/pkg/specgen"
11-
. "github.com/onsi/ginkgo"
11+
. "github.com/onsi/ginkgo/v2"
1212
. "github.com/onsi/gomega"
1313
"github.com/onsi/gomega/gexec"
1414
)

pkg/bindings/test/auth_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/containers/image/v5/types"
99
podmanRegistry "github.com/containers/podman/v4/hack/podman-registry-go"
1010
"github.com/containers/podman/v4/pkg/bindings/images"
11-
. "github.com/onsi/ginkgo"
11+
. "github.com/onsi/ginkgo/v2"
1212
. "github.com/onsi/gomega"
1313
"github.com/onsi/gomega/gexec"
1414
)

pkg/bindings/test/common_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
. "github.com/containers/podman/v4/pkg/bindings"
1414
"github.com/containers/podman/v4/pkg/bindings/containers"
1515
"github.com/containers/podman/v4/pkg/specgen"
16-
"github.com/onsi/ginkgo"
16+
"github.com/onsi/ginkgo/v2"
1717
. "github.com/onsi/gomega"
1818
. "github.com/onsi/gomega/gexec"
1919
)

pkg/bindings/test/connection_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
"github.com/containers/podman/v4/pkg/bindings/containers"
88
"github.com/containers/podman/v4/pkg/bindings/system"
9-
. "github.com/onsi/ginkgo"
9+
. "github.com/onsi/ginkgo/v2"
1010
. "github.com/onsi/gomega"
1111
"github.com/onsi/gomega/gexec"
1212
)

pkg/bindings/test/containers_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/containers/podman/v4/pkg/bindings/containers"
1111
"github.com/containers/podman/v4/pkg/domain/entities/reports"
1212
"github.com/containers/podman/v4/pkg/specgen"
13-
. "github.com/onsi/ginkgo"
13+
. "github.com/onsi/ginkgo/v2"
1414
. "github.com/onsi/gomega"
1515
"github.com/onsi/gomega/gexec"
1616
)

pkg/bindings/test/create_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55

66
"github.com/containers/podman/v4/pkg/bindings/containers"
77
"github.com/containers/podman/v4/pkg/specgen"
8-
. "github.com/onsi/ginkgo"
8+
. "github.com/onsi/ginkgo/v2"
99
. "github.com/onsi/gomega"
1010
"github.com/onsi/gomega/gexec"
1111
)

pkg/bindings/test/exec_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55

66
"github.com/containers/podman/v4/pkg/api/handlers"
77
"github.com/containers/podman/v4/pkg/bindings/containers"
8-
. "github.com/onsi/ginkgo"
8+
. "github.com/onsi/ginkgo/v2"
99
. "github.com/onsi/gomega"
1010
"github.com/onsi/gomega/gexec"
1111
)

pkg/bindings/test/generator_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package bindings_test
22

33
import (
44
"github.com/containers/podman/v4/pkg/bindings/containers"
5-
. "github.com/onsi/ginkgo"
5+
. "github.com/onsi/ginkgo/v2"
66
. "github.com/onsi/gomega"
77
. "github.com/onsi/gomega/gstruct"
88
)

0 commit comments

Comments
 (0)