From 7a549fd9ac82851730c994324bef0537f1d4d790 Mon Sep 17 00:00:00 2001 From: liornoy Date: Tue, 13 Dec 2022 14:44:29 +0200 Subject: [PATCH] Update tests source code to ginkgo v2 This commit updates the tests to import ginkgo v2. --- pkg/checkpoint/checkpoint_test.go | 2 +- pkg/k8sclient/k8sclient_test.go | 2 +- pkg/kubeletclient/kubeletclient_test.go | 2 +- pkg/logging/logging_test.go | 2 +- pkg/multus/multus_cni020_test.go | 2 +- pkg/multus/multus_cni040_test.go | 2 +- pkg/multus/multus_cni100_test.go | 2 +- pkg/multus/multus_suite_test.go | 2 +- pkg/netutils/netutils_test.go | 2 +- pkg/server/config/config_suite_test.go | 2 +- pkg/server/config/generator_test.go | 2 +- pkg/server/config/manager_test.go | 2 +- pkg/server/exec_chroot_test.go | 2 +- pkg/server/server_suite_test.go | 2 +- pkg/server/thick_cni_test.go | 2 +- pkg/types/conf_test.go | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkg/checkpoint/checkpoint_test.go b/pkg/checkpoint/checkpoint_test.go index 7075eae50..f17c2ceaa 100644 --- a/pkg/checkpoint/checkpoint_test.go +++ b/pkg/checkpoint/checkpoint_test.go @@ -19,7 +19,7 @@ import ( "fmt" "os" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/pkg/k8sclient/k8sclient_test.go b/pkg/k8sclient/k8sclient_test.go index 54afc67a8..33a53e00f 100644 --- a/pkg/k8sclient/k8sclient_test.go +++ b/pkg/k8sclient/k8sclient_test.go @@ -33,7 +33,7 @@ import ( "k8s.io/client-go/kubernetes/fake" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/kubeletclient/kubeletclient_test.go b/pkg/kubeletclient/kubeletclient_test.go index 8cd946de7..da1cda0a8 100644 --- a/pkg/kubeletclient/kubeletclient_test.go +++ b/pkg/kubeletclient/kubeletclient_test.go @@ -24,7 +24,7 @@ import ( "path/filepath" "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "golang.org/x/sys/unix" diff --git a/pkg/logging/logging_test.go b/pkg/logging/logging_test.go index 4bca63467..d1d17acfb 100644 --- a/pkg/logging/logging_test.go +++ b/pkg/logging/logging_test.go @@ -23,7 +23,7 @@ import ( testutils "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/testing" "gopkg.in/natefinch/lumberjack.v2" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/multus/multus_cni020_test.go b/pkg/multus/multus_cni020_test.go index 195660dc1..f1dbc03c9 100644 --- a/pkg/multus/multus_cni020_test.go +++ b/pkg/multus/multus_cni020_test.go @@ -31,7 +31,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/tools/record" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/multus/multus_cni040_test.go b/pkg/multus/multus_cni040_test.go index 66862f0cf..def3bdd09 100644 --- a/pkg/multus/multus_cni040_test.go +++ b/pkg/multus/multus_cni040_test.go @@ -30,7 +30,7 @@ import ( "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/types" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/multus/multus_cni100_test.go b/pkg/multus/multus_cni100_test.go index 7f7f18ef5..aa285c0a2 100644 --- a/pkg/multus/multus_cni100_test.go +++ b/pkg/multus/multus_cni100_test.go @@ -28,7 +28,7 @@ import ( testhelpers "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/testing" "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/types" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/multus/multus_suite_test.go b/pkg/multus/multus_suite_test.go index 4822c1654..a46b474ce 100644 --- a/pkg/multus/multus_suite_test.go +++ b/pkg/multus/multus_suite_test.go @@ -33,7 +33,7 @@ import ( "k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/tools/record" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/netutils/netutils_test.go b/pkg/netutils/netutils_test.go index e41f9bda5..e91d38b98 100644 --- a/pkg/netutils/netutils_test.go +++ b/pkg/netutils/netutils_test.go @@ -29,7 +29,7 @@ import ( "github.com/vishvananda/netlink" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/server/config/config_suite_test.go b/pkg/server/config/config_suite_test.go index f50de8f80..8214cad75 100644 --- a/pkg/server/config/config_suite_test.go +++ b/pkg/server/config/config_suite_test.go @@ -15,7 +15,7 @@ package config import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/pkg/server/config/generator_test.go b/pkg/server/config/generator_test.go index 48937d3fd..27af2f333 100644 --- a/pkg/server/config/generator_test.go +++ b/pkg/server/config/generator_test.go @@ -22,7 +22,7 @@ import ( testutils "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/server/config/manager_test.go b/pkg/server/config/manager_test.go index 964939ef6..0e1896647 100644 --- a/pkg/server/config/manager_test.go +++ b/pkg/server/config/manager_test.go @@ -20,7 +20,7 @@ import ( "os" "time" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/server/exec_chroot_test.go b/pkg/server/exec_chroot_test.go index 8345615a1..80b3b2c50 100644 --- a/pkg/server/exec_chroot_test.go +++ b/pkg/server/exec_chroot_test.go @@ -18,7 +18,7 @@ import ( "context" "os" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/server/server_suite_test.go b/pkg/server/server_suite_test.go index 6fd454f59..bc80c1428 100644 --- a/pkg/server/server_suite_test.go +++ b/pkg/server/server_suite_test.go @@ -15,7 +15,7 @@ package server import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/pkg/server/thick_cni_test.go b/pkg/server/thick_cni_test.go index c3ca4c782..e5458fd4f 100644 --- a/pkg/server/thick_cni_test.go +++ b/pkg/server/thick_cni_test.go @@ -19,7 +19,7 @@ import ( "fmt" "os" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/containernetworking/cni/pkg/skel" diff --git a/pkg/types/conf_test.go b/pkg/types/conf_test.go index d8852fd62..b61cffb04 100644 --- a/pkg/types/conf_test.go +++ b/pkg/types/conf_test.go @@ -28,7 +28,7 @@ import ( netutils "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/utils" testhelpers "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" )