vendor, bump to ginkgo v2

Signed-off-by: Ram Lavi <[email protected]>
k8snetworkplumbingwg · Mar 20, 2022 · d1efc08 · d1efc08
1 parent 5f06e27
commit d1efc08
Show file tree

Hide file tree

Showing 163 changed files with 9,948 additions and 8,811 deletions.
diff --git a/automation/check-patch.e2e-k8s.sh b/automation/check-patch.e2e-k8s.sh
@@ -17,7 +17,7 @@ main() {
     make cluster-up
     trap teardown EXIT SIGINT SIGTERM SIGSTOP
     make cluster-sync
-    make E2E_TEST_ARGS="-ginkgo.noColor --junit-output=$ARTIFACTS/junit.functest.xml" functest
+    make E2E_TEST_ARGS="-ginkgo.noColor --ginkgo.junit-report=$ARTIFACTS/junit.functest.xml" functest
 }
 
 [[ "${BASH_SOURCE[0]}" == "$0" ]] && main "$@"
diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/go-logr/logr v1.2.0
 	github.com/intel/multus-cni v0.0.0-20200316125841-bfaf22964b51
 	github.com/mattn/goveralls v0.0.7
-	github.com/onsi/ginkgo v1.16.5
+	github.com/onsi/ginkgo/v2 v2.1.3
 	github.com/onsi/gomega v1.17.0
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.11.0
@@ -18,7 +18,6 @@ require (
 	k8s.io/code-generator v0.23.1
 	kubevirt.io/client-go v0.37.1
 	kubevirt.io/kubevirt v0.37.1
-	kubevirt.io/qe-tools v0.1.6
 	sigs.k8s.io/controller-runtime v0.11.1
 	sigs.k8s.io/controller-tools v0.6.0
 	sigs.k8s.io/kustomize/kustomize/v3 v3.3.0
@@ -58,7 +57,6 @@ require (
 	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/nxadm/tail v1.4.8 // indirect
 	github.com/openshift/custom-resource-status v0.0.0-20200602122900-c002fd1547ca // indirect
 	github.com/pborman/uuid v1.2.0 // indirect
 	github.com/prometheus/client_model v0.2.0 // indirect
@@ -81,7 +79,6 @@ require (
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.27.1 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 	k8s.io/apiextensions-apiserver v0.23.1 // indirect

diff --git a/go.sum b/go.sum
@@ -437,6 +437,7 @@ github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v0.0.0-20170306145142-6a5e28554805/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -679,6 +680,8 @@ github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvw
 github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
 github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
+github.com/onsi/ginkgo/v2 v2.1.3 h1:e/3Cwtogj0HA+25nMP1jCMDIf8RtRYbGwGGuBIFztkc=
+github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
 github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.4.2-0.20180831124310-ae19f1b56d53/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=

diff --git a/hack/functest.sh b/hack/functest.sh
@@ -5,4 +5,4 @@ set -xe
 source ./cluster/cluster.sh
 
 export KUBEVIRT_CLIENT_GO_SCHEME_REGISTRATION_VERSION=v1
-KUBECONFIG=${KUBECONFIG:-$(cluster::kubeconfig)} $GO test -test.timeout=1h -race -test.v ./tests/... $E2E_TEST_ARGS -ginkgo.v --test-suite-params="$POLARION_TEST_SUITE_PARAMS"
+KUBECONFIG=${KUBECONFIG:-$(cluster::kubeconfig)} $GO test --ginkgo.timeout=1h -race -test.v ./tests/... $E2E_TEST_ARGS -ginkgo.v
diff --git a/pkg/names/names_suite_test.go b/pkg/names/names_suite_test.go
@@ -19,7 +19,7 @@ package names
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

diff --git a/pkg/names/names_test.go b/pkg/names/names_test.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"reflect"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

diff --git a/pkg/pool-manager/macentry_test.go b/pkg/pool-manager/macentry_test.go
@@ -4,8 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	. "github.com/onsi/ginkgo"
-	"github.com/onsi/ginkgo/extensions/table"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
@@ -60,39 +59,39 @@ var _ = Describe("mac-entry", func() {
 			macAddress    string
 			shouldSucceed bool
 		}
-		table.DescribeTable("and performing hasExpiredTransaction on macPoolMap entry",
+		DescribeTable("and performing hasExpiredTransaction on macPoolMap entry",
 			func(i *hasExpiredTransactionParams) {
 				entry := poolManager.macPoolMap[i.macAddress]
 				isStale, err := entry.hasExpiredTransaction(poolManager.waitTime)
 				Expect(err).ToNot(HaveOccurred(), "hasExpiredTransaction should not return error")
 				Expect(isStale).To(Equal(i.shouldSucceed), fmt.Sprintf("mac entry %s staleness status is not as expected", i.macAddress))
 			},
-			table.Entry("Should find all stale entries in macPoolMap on entry mac: 02:00:00:00:00:00",
+			Entry("Should find all stale entries in macPoolMap on entry mac: 02:00:00:00:00:00",
 				&hasExpiredTransactionParams{
 					macAddress:    "02:00:00:00:00:00",
 					shouldSucceed: false,
 				}),
-			table.Entry("Should find all stale entries in macPoolMap on entry mac: 02:00:00:00:00:01",
+			Entry("Should find all stale entries in macPoolMap on entry mac: 02:00:00:00:00:01",
 				&hasExpiredTransactionParams{
 					macAddress:    "02:00:00:00:00:01",
 					shouldSucceed: true,
 				}),
-			table.Entry("Should find all stale entries in macPoolMap on entry mac: mac: 02:00:00:00:00:02",
+			Entry("Should find all stale entries in macPoolMap on entry mac: mac: 02:00:00:00:00:02",
 				&hasExpiredTransactionParams{
 					macAddress:    "02:00:00:00:00:02",
 					shouldSucceed: false,
 				}),
-			table.Entry("Should find all stale entries in macPoolMap on entry mac: mac: 02:00:00:00:00:03",
+			Entry("Should find all stale entries in macPoolMap on entry mac: mac: 02:00:00:00:00:03",
 				&hasExpiredTransactionParams{
 					macAddress:    "02:00:00:00:00:03",
 					shouldSucceed: true,
 				}),
-			table.Entry("Should find all stale entries in macPoolMap on entry mac: mac: 02:00:00:00:00:04",
+			Entry("Should find all stale entries in macPoolMap on entry mac: mac: 02:00:00:00:00:04",
 				&hasExpiredTransactionParams{
 					macAddress:    "02:00:00:00:00:04",
 					shouldSucceed: false,
 				}),
-			table.Entry("Should find all stale entries in macPoolMap on entry mac: mac: 02:00:00:00:00:05",
+			Entry("Should find all stale entries in macPoolMap on entry mac: mac: 02:00:00:00:00:05",
 				&hasExpiredTransactionParams{
 					macAddress:    "02:00:00:00:00:05",
 					shouldSucceed: false,
@@ -103,38 +102,38 @@ var _ = Describe("mac-entry", func() {
 			macAddress    string
 			shouldSucceed bool
 		}
-		table.DescribeTable("and performing hasPendingTransaction on macPoolMap entry",
+		DescribeTable("and performing hasPendingTransaction on macPoolMap entry",
 			func(i *hasPendingTransactionParams) {
 				entry := poolManager.macPoolMap[i.macAddress]
 				hasPendingTransaction := entry.hasPendingTransaction()
 				Expect(hasPendingTransaction).To(Equal(i.shouldSucceed), fmt.Sprintf("mac entry %s update required status is not as expected", i.macAddress))
 			},
-			table.Entry("Should distinguish between entries that needs update on mac entry: 02:00:00:00:00:00",
+			Entry("Should distinguish between entries that needs update on mac entry: 02:00:00:00:00:00",
 				&hasPendingTransactionParams{
 					macAddress:    "02:00:00:00:00:00",
 					shouldSucceed: true,
 				}),
-			table.Entry("Should distinguish between entries that needs update on mac entry: 02:00:00:00:00:01",
+			Entry("Should distinguish between entries that needs update on mac entry: 02:00:00:00:00:01",
 				&hasPendingTransactionParams{
 					macAddress:    "02:00:00:00:00:01",
 					shouldSucceed: true,
 				}),
-			table.Entry("Should distinguish between entries that needs update on mac entry: 02:00:00:00:00:02",
+			Entry("Should distinguish between entries that needs update on mac entry: 02:00:00:00:00:02",
 				&hasPendingTransactionParams{
 					macAddress:    "02:00:00:00:00:02",
 					shouldSucceed: true,
 				}),
-			table.Entry("Should distinguish between entries that needs update on mac entry: 02:00:00:00:00:03",
+			Entry("Should distinguish between entries that needs update on mac entry: 02:00:00:00:00:03",
 				&hasPendingTransactionParams{
 					macAddress:    "02:00:00:00:00:03",
 					shouldSucceed: true,
 				}),
-			table.Entry("Should distinguish between entries that needs update on mac entry: 02:00:00:00:00:04",
+			Entry("Should distinguish between entries that needs update on mac entry: 02:00:00:00:00:04",
 				&hasPendingTransactionParams{
 					macAddress:    "02:00:00:00:00:04",
 					shouldSucceed: true,
 				}),
-			table.Entry("Should distinguish between entries that needs update on mac entry: 02:00:00:00:00:05",
+			Entry("Should distinguish between entries that needs update on mac entry: 02:00:00:00:00:05",
 				&hasPendingTransactionParams{
 					macAddress:    "02:00:00:00:00:05",
 					shouldSucceed: false,
@@ -146,31 +145,31 @@ var _ = Describe("mac-entry", func() {
 			latestPersistedTimestamp *time.Time
 			expectedEntryReadiness   bool
 		}
-		table.DescribeTable("and performing hasReadyTransaction on macPoolMap",
+		DescribeTable("and performing hasReadyTransaction on macPoolMap",
 			func(i *hasReadyTransactionParams) {
 				entry := poolManager.macPoolMap[i.macAddress]
 				isUpdated := entry.hasReadyTransaction(i.latestPersistedTimestamp)
 				Expect(isUpdated).To(Equal(i.expectedEntryReadiness), fmt.Sprintf("should get expected readiness on mac %s", i.macAddress))
 			},
-			table.Entry("Should deem mac entry with old timestamp as ready if persistent timestamp occurred after it",
+			Entry("Should deem mac entry with old timestamp as ready if persistent timestamp occurred after it",
 				&hasReadyTransactionParams{
 					macAddress:               "02:00:00:00:00:01",
 					latestPersistedTimestamp: &timestampBeforeCurrentTimestamp,
 					expectedEntryReadiness:   true,
 				}),
-			table.Entry("Should deem mac entry with current timestamp as ready if persistent timestamp occurred after it",
+			Entry("Should deem mac entry with current timestamp as ready if persistent timestamp occurred after it",
 				&hasReadyTransactionParams{
 					macAddress:               "02:00:00:00:00:02",
 					latestPersistedTimestamp: &newTimestamp,
 					expectedEntryReadiness:   true,
 				}),
-			table.Entry("Should deem mac entry with current timestamp as ready if persistent timestamp equals to it",
+			Entry("Should deem mac entry with current timestamp as ready if persistent timestamp equals to it",
 				&hasReadyTransactionParams{
 					macAddress:               "02:00:00:00:00:02",
 					latestPersistedTimestamp: &currentTimestamp,
 					expectedEntryReadiness:   true,
 				}),
-			table.Entry("Should deem mac entry with current timestamp as not ready if persistent timestamp occurred before it",
+			Entry("Should deem mac entry with current timestamp as not ready if persistent timestamp occurred before it",
 				&hasReadyTransactionParams{
 					macAddress:               "02:00:00:00:00:02",
 					latestPersistedTimestamp: &timestampBeforeCurrentTimestamp,