Skip to content

Commit 8e991ee

Browse files
committed
chore: use ginkgo v2
use ginkgo v2 in tests Signed-off-by: adrianc <[email protected]>
1 parent c4b7119 commit 8e991ee

39 files changed

+97
-113
lines changed

cmd/sriovdp/manager_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ import (
1919
"os"
2020
"testing"
2121

22-
. "github.com/onsi/ginkgo"
23-
. "github.com/onsi/ginkgo/extensions/table"
22+
. "github.com/onsi/ginkgo/v2"
2423
. "github.com/onsi/gomega"
2524
"github.com/stretchr/testify/mock"
2625

go.mod

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/k8snetworkplumbingwg/govdpa v0.1.4
1212
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.7.7
1313
github.com/k8snetworkplumbingwg/sriovnet v1.2.1-0.20240128120937-3ca5e43034e6
14-
github.com/onsi/ginkgo v1.16.5
14+
github.com/onsi/ginkgo/v2 v2.27.2
1515
github.com/onsi/gomega v1.38.2
1616
github.com/pkg/errors v0.9.1
1717
github.com/stretchr/testify v1.11.1
@@ -32,19 +32,20 @@ require (
3232
github.com/go-openapi/jsonpointer v0.21.0 // indirect
3333
github.com/go-openapi/jsonreference v0.20.2 // indirect
3434
github.com/go-openapi/swag v0.23.0 // indirect
35+
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
3536
github.com/gogo/protobuf v1.3.2 // indirect
3637
github.com/golang/protobuf v1.5.4 // indirect
3738
github.com/google/gnostic-models v0.6.9 // indirect
3839
github.com/google/go-cmp v0.7.0 // indirect
3940
github.com/google/gofuzz v1.2.0 // indirect
41+
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
4042
github.com/google/uuid v1.6.0 // indirect
4143
github.com/josharian/intern v1.0.0 // indirect
4244
github.com/json-iterator/go v1.1.12 // indirect
4345
github.com/mailru/easyjson v0.7.7 // indirect
4446
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4547
github.com/modern-go/reflect2 v1.0.2 // indirect
4648
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
47-
github.com/nxadm/tail v1.4.8 // indirect
4849
github.com/opencontainers/runc v1.2.8 // indirect
4950
github.com/opencontainers/runtime-spec v1.2.0 // indirect
5051
github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626 // indirect
@@ -56,18 +57,19 @@ require (
5657
github.com/x448/float16 v0.8.4 // indirect
5758
github.com/yusufpapurcu/wmi v1.2.4 // indirect
5859
go.yaml.in/yaml/v3 v3.0.4 // indirect
59-
golang.org/x/mod v0.26.0 // indirect
60+
golang.org/x/mod v0.27.0 // indirect
6061
golang.org/x/net v0.43.0 // indirect
6162
golang.org/x/oauth2 v0.30.0 // indirect
63+
golang.org/x/sync v0.16.0 // indirect
6264
golang.org/x/sys v0.35.0 // indirect
6365
golang.org/x/term v0.34.0 // indirect
6466
golang.org/x/text v0.28.0 // indirect
6567
golang.org/x/time v0.7.0 // indirect
68+
golang.org/x/tools v0.36.0 // indirect
6669
google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
6770
google.golang.org/protobuf v1.36.7 // indirect
6871
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
6972
gopkg.in/inf.v0 v0.9.1 // indirect
70-
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
7173
gopkg.in/yaml.v3 v3.0.1 // indirect
7274
howett.net/plist v1.0.2-0.20250314012144-ee69052608d9 // indirect
7375
k8s.io/api v0.32.0 // indirect

go.sum

Lines changed: 30 additions & 29 deletions
Large diffs are not rendered by default.

pkg/accelerator/accelDeviceProvider_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package accelerator_test
1717
import (
1818
"github.com/jaypipes/ghw"
1919
"github.com/jaypipes/pcidb"
20-
. "github.com/onsi/ginkgo"
20+
. "github.com/onsi/ginkgo/v2"
2121
. "github.com/onsi/gomega"
2222

2323
"github.com/k8snetworkplumbingwg/sriov-network-device-plugin/pkg/accelerator"

pkg/accelerator/accelDevice_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package accelerator_test
1717
import (
1818
"github.com/jaypipes/ghw"
1919
"github.com/jaypipes/pcidb"
20-
. "github.com/onsi/ginkgo"
20+
. "github.com/onsi/ginkgo/v2"
2121
. "github.com/onsi/gomega"
2222

2323
"github.com/k8snetworkplumbingwg/sriov-network-device-plugin/pkg/accelerator"

pkg/accelerator/accelResourcePool_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
package accelerator_test
1616

1717
import (
18-
. "github.com/onsi/ginkgo"
18+
. "github.com/onsi/ginkgo/v2"
1919
. "github.com/onsi/gomega"
2020
pluginapi "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1"
2121

pkg/accelerator/accelerator_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package accelerator_test
1717
import (
1818
"testing"
1919

20-
. "github.com/onsi/ginkgo"
20+
. "github.com/onsi/ginkgo/v2"
2121
. "github.com/onsi/gomega"
2222
)
2323

pkg/auxnetdevice/auxNetDeviceProvider_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ package auxnetdevice_test
2020
import (
2121
"github.com/jaypipes/ghw"
2222
"github.com/jaypipes/pcidb"
23-
. "github.com/onsi/ginkgo"
24-
. "github.com/onsi/ginkgo/extensions/table"
23+
. "github.com/onsi/ginkgo/v2"
2524
. "github.com/onsi/gomega"
2625
"github.com/stretchr/testify/mock"
2726

pkg/auxnetdevice/auxNetDevice_test.go

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

2323
"github.com/jaypipes/ghw"
2424
"github.com/jaypipes/pcidb"
25-
. "github.com/onsi/ginkgo"
25+
. "github.com/onsi/ginkgo/v2"
2626
. "github.com/onsi/gomega"
2727
pluginapi "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1"
2828

pkg/auxnetdevice/auxNetResourcePool_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package auxnetdevice_test
1919

2020
import (
21-
. "github.com/onsi/ginkgo"
21+
. "github.com/onsi/ginkgo/v2"
2222
. "github.com/onsi/gomega"
2323
pluginapi "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1"
2424

0 commit comments

Comments
 (0)