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

@@ -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)
})
})
}
})