diff --git a/integration/integration_linux_test.go b/integration/integration_linux_test.go index 08b2bfaf..98a967af 100644 --- a/integration/integration_linux_test.go +++ b/integration/integration_linux_test.go @@ -28,7 +28,7 @@ import ( "strings" "time" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" "github.com/onsi/gomega/gexec" diff --git a/integration/integration_suite_test.go b/integration/integration_suite_test.go index de861c45..595915e7 100644 --- a/integration/integration_suite_test.go +++ b/integration/integration_suite_test.go @@ -17,7 +17,7 @@ import ( "strings" "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" ) diff --git a/pkg/hns/netconf_suite_windows_test.go b/pkg/hns/netconf_suite_windows_test.go index 90675961..0877bed1 100644 --- a/pkg/hns/netconf_suite_windows_test.go +++ b/pkg/hns/netconf_suite_windows_test.go @@ -14,7 +14,7 @@ package hns import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/pkg/hns/netconf_windows_test.go b/pkg/hns/netconf_windows_test.go index 3d2d9a66..9cd7c434 100644 --- a/pkg/hns/netconf_windows_test.go +++ b/pkg/hns/netconf_windows_test.go @@ -18,7 +18,7 @@ import ( "net" "github.com/Microsoft/hcsshim/hcn" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/ip/cidr_test.go b/pkg/ip/cidr_test.go index 1f617ce7..4a9d74d1 100644 --- a/pkg/ip/cidr_test.go +++ b/pkg/ip/cidr_test.go @@ -17,7 +17,7 @@ package ip import ( "net" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/ip/ip_suite_test.go b/pkg/ip/ip_suite_test.go index 3dbd7a24..da97ba9a 100644 --- a/pkg/ip/ip_suite_test.go +++ b/pkg/ip/ip_suite_test.go @@ -15,7 +15,7 @@ package ip_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/pkg/ip/ip_test.go b/pkg/ip/ip_test.go index 41ddee26..6e8545ab 100644 --- a/pkg/ip/ip_test.go +++ b/pkg/ip/ip_test.go @@ -19,7 +19,7 @@ import ( "fmt" "net" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) @@ -174,8 +174,8 @@ var _ = Describe("IP Operations", func() { } }) - It("Decode", func() { - Context("valid IP", func() { + Context("Decode", func() { + It("valid IP", func() { testCases := []struct { text string expected *IP @@ -208,7 +208,7 @@ var _ = Describe("IP Operations", func() { }) - Context("empty text", func() { + It("empty text", func() { ip := &IP{} err := json.Unmarshal([]byte(`""`), ip) @@ -216,7 +216,7 @@ var _ = Describe("IP Operations", func() { Expect(ip).To(Equal(newIP(nil, nil))) }) - Context("invalid IP", func() { + It("invalid IP", func() { testCases := []struct { text string expectedErr error @@ -243,7 +243,7 @@ var _ = Describe("IP Operations", func() { } }) - Context("IP slice", func() { + It("IP slice", func() { testCases := []struct { text string expected []*IP diff --git a/pkg/ip/ipforward_linux_test.go b/pkg/ip/ipforward_linux_test.go index 8c086de4..e28ccad8 100644 --- a/pkg/ip/ipforward_linux_test.go +++ b/pkg/ip/ipforward_linux_test.go @@ -4,7 +4,7 @@ import ( "os" "time" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/ip/link_linux_test.go b/pkg/ip/link_linux_test.go index c57f9369..d10ff240 100644 --- a/pkg/ip/link_linux_test.go +++ b/pkg/ip/link_linux_test.go @@ -20,7 +20,7 @@ import ( "fmt" "net" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/containernetworking/plugins/pkg/ip" diff --git a/pkg/ipam/ipam_linux_test.go b/pkg/ipam/ipam_linux_test.go index 1921cb88..d6a3d839 100644 --- a/pkg/ipam/ipam_linux_test.go +++ b/pkg/ipam/ipam_linux_test.go @@ -25,7 +25,7 @@ import ( "github.com/vishvananda/netlink" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/ipam/ipam_suite_test.go b/pkg/ipam/ipam_suite_test.go index 641bc026..ce27653b 100644 --- a/pkg/ipam/ipam_suite_test.go +++ b/pkg/ipam/ipam_suite_test.go @@ -15,7 +15,7 @@ package ipam_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/pkg/link/link_suite_test.go b/pkg/link/link_suite_test.go index 02364a34..2054d97c 100644 --- a/pkg/link/link_suite_test.go +++ b/pkg/link/link_suite_test.go @@ -17,7 +17,7 @@ package link_test import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/link/spoofcheck_test.go b/pkg/link/spoofcheck_test.go index e93d9a81..ff9ebdaf 100644 --- a/pkg/link/spoofcheck_test.go +++ b/pkg/link/spoofcheck_test.go @@ -18,7 +18,7 @@ import ( "fmt" "github.com/networkplumbing/go-nft/nft" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/containernetworking/plugins/pkg/link" diff --git a/pkg/ns/ns_linux_test.go b/pkg/ns/ns_linux_test.go index bb54e2aa..82d07b4b 100644 --- a/pkg/ns/ns_linux_test.go +++ b/pkg/ns/ns_linux_test.go @@ -23,7 +23,7 @@ import ( "github.com/containernetworking/plugins/pkg/ns" "github.com/containernetworking/plugins/pkg/testutils" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "golang.org/x/sys/unix" ) diff --git a/pkg/ns/ns_suite_test.go b/pkg/ns/ns_suite_test.go index e969958e..f5ea1d00 100644 --- a/pkg/ns/ns_suite_test.go +++ b/pkg/ns/ns_suite_test.go @@ -18,15 +18,14 @@ import ( "math/rand" "runtime" - . "github.com/onsi/ginkgo" - "github.com/onsi/ginkgo/config" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" ) func TestNs(t *testing.T) { - rand.Seed(config.GinkgoConfig.RandomSeed) + rand.Seed(GinkgoRandomSeed()) runtime.LockOSThread() RegisterFailHandler(Fail) diff --git a/pkg/testutils/echo/echo_test.go b/pkg/testutils/echo/echo_test.go index 01062ae0..1a04e4d5 100644 --- a/pkg/testutils/echo/echo_test.go +++ b/pkg/testutils/echo/echo_test.go @@ -7,7 +7,7 @@ import ( "os/exec" "strings" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" "github.com/onsi/gomega/gexec" diff --git a/pkg/testutils/echo/init_test.go b/pkg/testutils/echo/init_test.go index e273d702..8160dc35 100644 --- a/pkg/testutils/echo/init_test.go +++ b/pkg/testutils/echo/init_test.go @@ -1,7 +1,7 @@ package main_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/pkg/utils/iptables_test.go b/pkg/utils/iptables_test.go index dee73d63..fec5a813 100644 --- a/pkg/utils/iptables_test.go +++ b/pkg/utils/iptables_test.go @@ -22,7 +22,7 @@ import ( "github.com/containernetworking/plugins/pkg/ns" "github.com/containernetworking/plugins/pkg/testutils" "github.com/coreos/go-iptables/iptables" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/utils/sysctl/sysctl_linux_test.go b/pkg/utils/sysctl/sysctl_linux_test.go index 7e9933d8..9450759d 100644 --- a/pkg/utils/sysctl/sysctl_linux_test.go +++ b/pkg/utils/sysctl/sysctl_linux_test.go @@ -23,7 +23,7 @@ import ( "github.com/containernetworking/plugins/pkg/ns" "github.com/containernetworking/plugins/pkg/testutils" "github.com/containernetworking/plugins/pkg/utils/sysctl" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/vishvananda/netlink" ) @@ -37,7 +37,7 @@ var _ = Describe("Sysctl tests", func() { var testIfaceName string var cleanup func() - BeforeEach(func() { + beforeEach := func() { // Save a reference to the original namespace, // Add a new NS @@ -67,7 +67,7 @@ var _ = Describe("Sysctl tests", func() { currNs.Set() } - }) + } AfterEach(func() { cleanup() @@ -75,6 +75,7 @@ var _ = Describe("Sysctl tests", func() { Describe("Sysctl", func() { It("reads keys with dot separators", func() { + beforeEach() sysctlIfaceName := strings.Replace(testIfaceName, ".", "/", -1) sysctlKey := fmt.Sprintf(sysctlDotKeyTemplate, sysctlIfaceName) @@ -85,6 +86,7 @@ var _ = Describe("Sysctl tests", func() { Describe("Sysctl", func() { It("reads keys with slash separators", func() { + beforeEach() sysctlKey := fmt.Sprintf(sysctlSlashKeyTemplate, testIfaceName) _, err := sysctl.Sysctl(sysctlKey) @@ -94,6 +96,7 @@ var _ = Describe("Sysctl tests", func() { Describe("Sysctl", func() { It("writes keys with dot separators", func() { + beforeEach() sysctlIfaceName := strings.Replace(testIfaceName, ".", "/", -1) sysctlKey := fmt.Sprintf(sysctlDotKeyTemplate, sysctlIfaceName) @@ -104,6 +107,7 @@ var _ = Describe("Sysctl tests", func() { Describe("Sysctl", func() { It("writes keys with slash separators", func() { + beforeEach() sysctlKey := fmt.Sprintf(sysctlSlashKeyTemplate, testIfaceName) _, err := sysctl.Sysctl(sysctlKey, "1") diff --git a/pkg/utils/sysctl/sysctl_suite_test.go b/pkg/utils/sysctl/sysctl_suite_test.go index 1c477e63..47c30d00 100644 --- a/pkg/utils/sysctl/sysctl_suite_test.go +++ b/pkg/utils/sysctl/sysctl_suite_test.go @@ -17,7 +17,7 @@ package sysctl_test import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/utils/utils_suite_test.go b/pkg/utils/utils_suite_test.go index c00ba667..775d61d2 100644 --- a/pkg/utils/utils_suite_test.go +++ b/pkg/utils/utils_suite_test.go @@ -15,7 +15,7 @@ package utils_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/pkg/utils/utils_test.go b/pkg/utils/utils_test.go index 0182c6d4..dda4d659 100644 --- a/pkg/utils/utils_test.go +++ b/pkg/utils/utils_test.go @@ -18,7 +18,7 @@ import ( "fmt" "strings" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/plugins/ipam/dhcp/dhcp2_test.go b/plugins/ipam/dhcp/dhcp2_test.go index f5a4c320..a7efe6ac 100644 --- a/plugins/ipam/dhcp/dhcp2_test.go +++ b/plugins/ipam/dhcp/dhcp2_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/plugins/ipam/dhcp/dhcp_suite_test.go b/plugins/ipam/dhcp/dhcp_suite_test.go index ba2a6fce..ac2b27c4 100644 --- a/plugins/ipam/dhcp/dhcp_suite_test.go +++ b/plugins/ipam/dhcp/dhcp_suite_test.go @@ -15,7 +15,7 @@ package main import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/plugins/ipam/dhcp/dhcp_test.go b/plugins/ipam/dhcp/dhcp_test.go index 2a2dec0c..8913093c 100644 --- a/plugins/ipam/dhcp/dhcp_test.go +++ b/plugins/ipam/dhcp/dhcp_test.go @@ -37,7 +37,7 @@ import ( "github.com/d2g/dhcp4server/leasepool" "github.com/d2g/dhcp4server/leasepool/memorypool" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/plugins/ipam/host-local/backend/allocator/allocator_suite_test.go b/plugins/ipam/host-local/backend/allocator/allocator_suite_test.go index 3ba02d47..a486bf89 100644 --- a/plugins/ipam/host-local/backend/allocator/allocator_suite_test.go +++ b/plugins/ipam/host-local/backend/allocator/allocator_suite_test.go @@ -15,7 +15,7 @@ package allocator_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/plugins/ipam/host-local/backend/allocator/allocator_test.go b/plugins/ipam/host-local/backend/allocator/allocator_test.go index 491fcee5..ccedca7c 100644 --- a/plugins/ipam/host-local/backend/allocator/allocator_test.go +++ b/plugins/ipam/host-local/backend/allocator/allocator_test.go @@ -22,7 +22,7 @@ import ( current "github.com/containernetworking/cni/pkg/types/100" fakestore "github.com/containernetworking/plugins/plugins/ipam/host-local/backend/testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/plugins/ipam/host-local/backend/allocator/config_test.go b/plugins/ipam/host-local/backend/allocator/config_test.go index 4c0e0a89..5d452bb2 100644 --- a/plugins/ipam/host-local/backend/allocator/config_test.go +++ b/plugins/ipam/host-local/backend/allocator/config_test.go @@ -18,7 +18,7 @@ import ( "net" "github.com/containernetworking/cni/pkg/types" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/plugins/ipam/host-local/backend/allocator/range_set_test.go b/plugins/ipam/host-local/backend/allocator/range_set_test.go index 0aced381..cc18877b 100644 --- a/plugins/ipam/host-local/backend/allocator/range_set_test.go +++ b/plugins/ipam/host-local/backend/allocator/range_set_test.go @@ -17,7 +17,7 @@ package allocator import ( "net" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/plugins/ipam/host-local/backend/allocator/range_test.go b/plugins/ipam/host-local/backend/allocator/range_test.go index ffee168e..f9edfcce 100644 --- a/plugins/ipam/host-local/backend/allocator/range_test.go +++ b/plugins/ipam/host-local/backend/allocator/range_test.go @@ -19,8 +19,7 @@ import ( "github.com/containernetworking/cni/pkg/types" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/plugins/ipam/host-local/backend/disk/disk_suite_test.go b/plugins/ipam/host-local/backend/disk/disk_suite_test.go index 814ac0fa..4f9b36e4 100644 --- a/plugins/ipam/host-local/backend/disk/disk_suite_test.go +++ b/plugins/ipam/host-local/backend/disk/disk_suite_test.go @@ -15,7 +15,7 @@ package disk import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/plugins/ipam/host-local/backend/disk/lock_test.go b/plugins/ipam/host-local/backend/disk/lock_test.go index 3afa516b..4591e103 100644 --- a/plugins/ipam/host-local/backend/disk/lock_test.go +++ b/plugins/ipam/host-local/backend/disk/lock_test.go @@ -18,7 +18,7 @@ import ( "os" "path/filepath" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/plugins/ipam/host-local/dns_test.go b/plugins/ipam/host-local/dns_test.go index d7e5c130..0b04cba9 100644 --- a/plugins/ipam/host-local/dns_test.go +++ b/plugins/ipam/host-local/dns_test.go @@ -18,7 +18,7 @@ import ( "os" "github.com/containernetworking/cni/pkg/types" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/plugins/ipam/host-local/host_local_suite_test.go b/plugins/ipam/host-local/host_local_suite_test.go index d458f6bd..10f0d5ec 100644 --- a/plugins/ipam/host-local/host_local_suite_test.go +++ b/plugins/ipam/host-local/host_local_suite_test.go @@ -15,7 +15,7 @@ package main import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/plugins/ipam/host-local/host_local_test.go b/plugins/ipam/host-local/host_local_test.go index b9841ab8..213c36be 100644 --- a/plugins/ipam/host-local/host_local_test.go +++ b/plugins/ipam/host-local/host_local_test.go @@ -27,7 +27,7 @@ import ( "github.com/containernetworking/plugins/pkg/testutils" "github.com/containernetworking/plugins/plugins/ipam/host-local/backend/disk" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/plugins/ipam/static/static_suite_test.go b/plugins/ipam/static/static_suite_test.go index c729ecf1..acc541e2 100644 --- a/plugins/ipam/static/static_suite_test.go +++ b/plugins/ipam/static/static_suite_test.go @@ -17,7 +17,7 @@ package main_test import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/plugins/ipam/static/static_test.go b/plugins/ipam/static/static_test.go index f1d4c017..a7f9e231 100644 --- a/plugins/ipam/static/static_test.go +++ b/plugins/ipam/static/static_test.go @@ -24,7 +24,7 @@ import ( types100 "github.com/containernetworking/cni/pkg/types/100" "github.com/containernetworking/plugins/pkg/testutils" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/plugins/main/bridge/bridge_suite_test.go b/plugins/main/bridge/bridge_suite_test.go index 3e48736b..1e882852 100644 --- a/plugins/main/bridge/bridge_suite_test.go +++ b/plugins/main/bridge/bridge_suite_test.go @@ -15,13 +15,26 @@ package main import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" ) +var ( + resolvConf string + err error +) + func TestBridge(t *testing.T) { RegisterFailHandler(Fail) + + resolvConf, err = newResolvConf() + Expect(err).NotTo(HaveOccurred()) + RunSpecs(t, "plugins/main/bridge") } + +var _ = AfterSuite(func() { + deleteResolvConf(resolvConf) +}) diff --git a/plugins/main/bridge/bridge_test.go b/plugins/main/bridge/bridge_test.go index 9a75e640..da393e8f 100644 --- a/plugins/main/bridge/bridge_test.go +++ b/plugins/main/bridge/bridge_test.go @@ -36,7 +36,7 @@ import ( "github.com/vishvananda/netlink" "github.com/containernetworking/plugins/plugins/ipam/host-local/backend/allocator" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) @@ -1619,9 +1619,6 @@ var _ = Describe("bridge Operations", func() { var originalNS, targetNS ns.NetNS var dataDir string - resolvConf, err := newResolvConf() - Expect(err).NotTo(HaveOccurred()) - BeforeEach(func() { // Create a new NetNS so we don't modify the host var err error @@ -1645,10 +1642,6 @@ var _ = Describe("bridge Operations", func() { Expect(testutils.UnmountNS(targetNS)).To(Succeed()) }) - AfterSuite(func() { - deleteResolvConf(resolvConf) - }) - for _, ver := range testutils.AllSpecVersions { // Redefine ver inside for scope so real value is picked up by each dynamically defined It() // See Gingkgo's "Patterns for dynamically generating tests" documentation. diff --git a/plugins/main/dummy/dummy_suite_test.go b/plugins/main/dummy/dummy_suite_test.go index 098b5949..c1157975 100644 --- a/plugins/main/dummy/dummy_suite_test.go +++ b/plugins/main/dummy/dummy_suite_test.go @@ -17,7 +17,7 @@ package main_test import ( "github.com/onsi/gomega/gexec" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/plugins/main/dummy/dummy_test.go b/plugins/main/dummy/dummy_test.go index 365b569e..185dd2b3 100644 --- a/plugins/main/dummy/dummy_test.go +++ b/plugins/main/dummy/dummy_test.go @@ -34,7 +34,7 @@ import ( "github.com/vishvananda/netlink" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/plugins/main/host-device/host-device_suite_test.go b/plugins/main/host-device/host-device_suite_test.go index 08cc1f91..aca9fd35 100644 --- a/plugins/main/host-device/host-device_suite_test.go +++ b/plugins/main/host-device/host-device_suite_test.go @@ -15,7 +15,7 @@ package main import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/plugins/main/host-device/host-device_test.go b/plugins/main/host-device/host-device_test.go index 5923c520..2320fc81 100644 --- a/plugins/main/host-device/host-device_test.go +++ b/plugins/main/host-device/host-device_test.go @@ -31,7 +31,7 @@ import ( "github.com/containernetworking/plugins/pkg/ns" "github.com/containernetworking/plugins/pkg/testutils" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/vishvananda/netlink" ) diff --git a/plugins/main/ipvlan/ipvlan_suite_test.go b/plugins/main/ipvlan/ipvlan_suite_test.go index 3cfb71d7..83f73cb9 100644 --- a/plugins/main/ipvlan/ipvlan_suite_test.go +++ b/plugins/main/ipvlan/ipvlan_suite_test.go @@ -15,7 +15,7 @@ package main import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/plugins/main/ipvlan/ipvlan_test.go b/plugins/main/ipvlan/ipvlan_test.go index 4ce72349..7f81ed4e 100644 --- a/plugins/main/ipvlan/ipvlan_test.go +++ b/plugins/main/ipvlan/ipvlan_test.go @@ -33,7 +33,7 @@ import ( "github.com/vishvananda/netlink" "github.com/containernetworking/plugins/plugins/ipam/host-local/backend/allocator" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/plugins/main/loopback/loopback_suite_test.go b/plugins/main/loopback/loopback_suite_test.go index d252d12b..1180a81d 100644 --- a/plugins/main/loopback/loopback_suite_test.go +++ b/plugins/main/loopback/loopback_suite_test.go @@ -17,7 +17,7 @@ package main_test import ( "github.com/onsi/gomega/gexec" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/plugins/main/loopback/loopback_test.go b/plugins/main/loopback/loopback_test.go index b2aec44c..b3f0e779 100644 --- a/plugins/main/loopback/loopback_test.go +++ b/plugins/main/loopback/loopback_test.go @@ -22,7 +22,7 @@ import ( "github.com/containernetworking/plugins/pkg/ns" "github.com/containernetworking/plugins/pkg/testutils" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" "github.com/onsi/gomega/gexec" diff --git a/plugins/main/macvlan/macvlan_suite_test.go b/plugins/main/macvlan/macvlan_suite_test.go index 566735f8..e70a0f52 100644 --- a/plugins/main/macvlan/macvlan_suite_test.go +++ b/plugins/main/macvlan/macvlan_suite_test.go @@ -15,7 +15,7 @@ package main import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/plugins/main/macvlan/macvlan_test.go b/plugins/main/macvlan/macvlan_test.go index d67be678..650e6229 100644 --- a/plugins/main/macvlan/macvlan_test.go +++ b/plugins/main/macvlan/macvlan_test.go @@ -33,7 +33,7 @@ import ( "github.com/vishvananda/netlink" "github.com/containernetworking/plugins/plugins/ipam/host-local/backend/allocator" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/plugins/main/ptp/ptp_suite_test.go b/plugins/main/ptp/ptp_suite_test.go index 547aa0d9..b8bd30bd 100644 --- a/plugins/main/ptp/ptp_suite_test.go +++ b/plugins/main/ptp/ptp_suite_test.go @@ -15,7 +15,7 @@ package main import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/plugins/main/ptp/ptp_test.go b/plugins/main/ptp/ptp_test.go index 395f97d8..adb016d1 100644 --- a/plugins/main/ptp/ptp_test.go +++ b/plugins/main/ptp/ptp_test.go @@ -31,7 +31,7 @@ import ( "github.com/vishvananda/netlink" "github.com/containernetworking/plugins/plugins/ipam/host-local/backend/allocator" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/plugins/main/tap/tap_suite_test.go b/plugins/main/tap/tap_suite_test.go index 3cbca695..fc5c2e9d 100644 --- a/plugins/main/tap/tap_suite_test.go +++ b/plugins/main/tap/tap_suite_test.go @@ -17,7 +17,7 @@ package main import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/plugins/main/tap/tap_test.go b/plugins/main/tap/tap_test.go index 3a5a3a31..a744730e 100644 --- a/plugins/main/tap/tap_test.go +++ b/plugins/main/tap/tap_test.go @@ -23,7 +23,7 @@ import ( "strings" "syscall" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/vishvananda/netlink" diff --git a/plugins/main/vlan/vlan_suite_test.go b/plugins/main/vlan/vlan_suite_test.go index b1ddb6e4..28a7c83d 100644 --- a/plugins/main/vlan/vlan_suite_test.go +++ b/plugins/main/vlan/vlan_suite_test.go @@ -15,7 +15,7 @@ package main import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/plugins/main/vlan/vlan_test.go b/plugins/main/vlan/vlan_test.go index 24984b6f..4b54bb0b 100644 --- a/plugins/main/vlan/vlan_test.go +++ b/plugins/main/vlan/vlan_test.go @@ -33,7 +33,7 @@ import ( "github.com/vishvananda/netlink" "github.com/containernetworking/plugins/plugins/ipam/host-local/backend/allocator" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/plugins/meta/bandwidth/bandwidth_linux_test.go b/plugins/meta/bandwidth/bandwidth_linux_test.go index 627b1619..755a0274 100644 --- a/plugins/meta/bandwidth/bandwidth_linux_test.go +++ b/plugins/meta/bandwidth/bandwidth_linux_test.go @@ -31,7 +31,7 @@ import ( "github.com/containernetworking/plugins/pkg/ns" "github.com/containernetworking/plugins/pkg/testutils" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" ) diff --git a/plugins/meta/bandwidth/bandwidth_suite_test.go b/plugins/meta/bandwidth/bandwidth_suite_test.go index f9cf9e0a..65593fb0 100644 --- a/plugins/meta/bandwidth/bandwidth_suite_test.go +++ b/plugins/meta/bandwidth/bandwidth_suite_test.go @@ -30,7 +30,7 @@ import ( "github.com/vishvananda/netlink" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/plugins/meta/firewall/firewall_firewalld_test.go b/plugins/meta/firewall/firewall_firewalld_test.go index e6f2f2c9..fea8ae87 100644 --- a/plugins/meta/firewall/firewall_firewalld_test.go +++ b/plugins/meta/firewall/firewall_firewalld_test.go @@ -30,7 +30,7 @@ import ( "github.com/godbus/dbus/v5" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/plugins/meta/firewall/firewall_integ_test.go b/plugins/meta/firewall/firewall_integ_test.go index 7a7c139d..7000f37c 100644 --- a/plugins/meta/firewall/firewall_integ_test.go +++ b/plugins/meta/firewall/firewall_integ_test.go @@ -26,7 +26,7 @@ import ( types100 "github.com/containernetworking/cni/pkg/types/100" "github.com/containernetworking/plugins/pkg/ns" "github.com/containernetworking/plugins/pkg/testutils" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/plugins/meta/firewall/firewall_iptables_test.go b/plugins/meta/firewall/firewall_iptables_test.go index 364cf4bb..d9d16815 100644 --- a/plugins/meta/firewall/firewall_iptables_test.go +++ b/plugins/meta/firewall/firewall_iptables_test.go @@ -31,7 +31,7 @@ import ( "github.com/coreos/go-iptables/iptables" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/plugins/meta/firewall/firewall_suite_test.go b/plugins/meta/firewall/firewall_suite_test.go index d3b10e21..760bebb7 100644 --- a/plugins/meta/firewall/firewall_suite_test.go +++ b/plugins/meta/firewall/firewall_suite_test.go @@ -15,7 +15,7 @@ package main import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/plugins/meta/portmap/chain_test.go b/plugins/meta/portmap/chain_test.go index c4e41be5..84f49219 100644 --- a/plugins/meta/portmap/chain_test.go +++ b/plugins/meta/portmap/chain_test.go @@ -23,7 +23,7 @@ import ( "github.com/containernetworking/plugins/pkg/ns" "github.com/containernetworking/plugins/pkg/testutils" "github.com/coreos/go-iptables/iptables" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) @@ -36,7 +36,7 @@ var _ = Describe("chain tests", func() { var testNs ns.NetNS var cleanup func() - BeforeEach(func() { + beforeEach := func() { // Save a reference to the original namespace, // Add a new NS @@ -84,9 +84,10 @@ var _ = Describe("chain tests", func() { currNs.Set() } - }) + } It("creates and destroys a chain", func() { + beforeEach() defer cleanup() tlChainName := testChain.entryChains[0] @@ -152,6 +153,7 @@ var _ = Describe("chain tests", func() { }) It("creates chains idempotently", func() { + beforeEach() defer cleanup() err := testChain.setup(ipt) @@ -171,6 +173,7 @@ var _ = Describe("chain tests", func() { }) It("deletes chains idempotently", func() { + beforeEach() defer cleanup() err := testChain.setup(ipt) @@ -199,6 +202,7 @@ var _ = Describe("chain tests", func() { }) It("deletes chains idempotently in parallel", func() { + beforeEach() defer cleanup() // number of parallel executions N := 10 diff --git a/plugins/meta/portmap/portmap_integ_test.go b/plugins/meta/portmap/portmap_integ_test.go index 2468865e..3e544a99 100644 --- a/plugins/meta/portmap/portmap_integ_test.go +++ b/plugins/meta/portmap/portmap_integ_test.go @@ -29,14 +29,12 @@ import ( "github.com/containernetworking/plugins/pkg/ns" "github.com/containernetworking/plugins/pkg/testutils" "github.com/coreos/go-iptables/iptables" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" "github.com/vishvananda/netlink" ) -const TIMEOUT = 90 - func makeConfig(ver string) *libcni.NetworkConfigList { configList, err := libcni.ConfListFromBytes([]byte(fmt.Sprintf(`{ "cniVersion": "%s", @@ -224,7 +222,7 @@ var _ = Describe("portmap integration tests", func() { } close(done) - }, TIMEOUT*9) + }) It(fmt.Sprintf("[%s] forwards a UDP port on ipv4 and keep working after creating a second container with the same HostPort", ver), func(done Done) { var err error @@ -421,7 +419,7 @@ var _ = Describe("portmap integration tests", func() { } close(done) - }, TIMEOUT*9) + }) }) } }) diff --git a/plugins/meta/portmap/portmap_suite_test.go b/plugins/meta/portmap/portmap_suite_test.go index 55aee924..c9f4528f 100644 --- a/plugins/meta/portmap/portmap_suite_test.go +++ b/plugins/meta/portmap/portmap_suite_test.go @@ -24,8 +24,7 @@ import ( "github.com/containernetworking/plugins/pkg/ns" - . "github.com/onsi/ginkgo" - "github.com/onsi/ginkgo/config" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" "github.com/onsi/gomega/gexec" @@ -34,7 +33,7 @@ import ( ) func TestPortmap(t *testing.T) { - rand.Seed(config.GinkgoConfig.RandomSeed) + rand.Seed(GinkgoRandomSeed()) RegisterFailHandler(Fail) RunSpecs(t, "plugins/meta/portmap") diff --git a/plugins/meta/portmap/portmap_test.go b/plugins/meta/portmap/portmap_test.go index dd68391d..dcd202aa 100644 --- a/plugins/meta/portmap/portmap_test.go +++ b/plugins/meta/portmap/portmap_test.go @@ -19,7 +19,7 @@ import ( "github.com/containernetworking/cni/pkg/types" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/plugins/meta/sbr/sbr_linux_test.go b/plugins/meta/sbr/sbr_linux_test.go index 3327609f..a34aa9ff 100644 --- a/plugins/meta/sbr/sbr_linux_test.go +++ b/plugins/meta/sbr/sbr_linux_test.go @@ -26,7 +26,7 @@ import ( "github.com/vishvananda/netlink" "golang.org/x/sys/unix" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/plugins/meta/sbr/sbr_suite_test.go b/plugins/meta/sbr/sbr_suite_test.go index d0bc1841..d8ce98b3 100644 --- a/plugins/meta/sbr/sbr_suite_test.go +++ b/plugins/meta/sbr/sbr_suite_test.go @@ -3,7 +3,7 @@ package main import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/plugins/meta/tuning/tuning_suite_test.go b/plugins/meta/tuning/tuning_suite_test.go index 8b9a75d0..654900d7 100644 --- a/plugins/meta/tuning/tuning_suite_test.go +++ b/plugins/meta/tuning/tuning_suite_test.go @@ -15,7 +15,7 @@ package main import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/plugins/meta/tuning/tuning_test.go b/plugins/meta/tuning/tuning_test.go index e17fb4e6..2bad674f 100644 --- a/plugins/meta/tuning/tuning_test.go +++ b/plugins/meta/tuning/tuning_test.go @@ -30,7 +30,7 @@ import ( "github.com/vishvananda/netlink" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/plugins/meta/vrf/vrf_suite_test.go b/plugins/meta/vrf/vrf_suite_test.go index e2c33d2c..9b80fc30 100644 --- a/plugins/meta/vrf/vrf_suite_test.go +++ b/plugins/meta/vrf/vrf_suite_test.go @@ -15,7 +15,7 @@ package main import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/plugins/meta/vrf/vrf_test.go b/plugins/meta/vrf/vrf_test.go index c7523bc7..2442c328 100644 --- a/plugins/meta/vrf/vrf_test.go +++ b/plugins/meta/vrf/vrf_test.go @@ -26,8 +26,7 @@ import ( "github.com/vishvananda/netlink" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/plugins/sample/sample_linux_test.go b/plugins/sample/sample_linux_test.go index 1c4949ae..c7c038da 100644 --- a/plugins/sample/sample_linux_test.go +++ b/plugins/sample/sample_linux_test.go @@ -20,7 +20,7 @@ import ( "github.com/containernetworking/cni/pkg/skel" "github.com/containernetworking/plugins/pkg/ns" "github.com/containernetworking/plugins/pkg/testutils" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/plugins/sample/sample_suite_test.go b/plugins/sample/sample_suite_test.go index cd79feee..de7b9e32 100644 --- a/plugins/sample/sample_suite_test.go +++ b/plugins/sample/sample_suite_test.go @@ -3,7 +3,7 @@ package main import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing"