Update tests to utilize ginkgo/v2

This commit updates the import of ginkgo to v2 in
all of the tests.

Signed-off-by: liornoy <lnoy@redhat.com>
Co-authored-by: Sascha Grunert <sgrunert@redhat.com>
This commit is contained in:
liornoy
2023-01-18 12:30:11 +02:00
parent 23c2134110
commit 2d1005ec02
73 changed files with 107 additions and 99 deletions

View File

@ -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.