mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-09-20 15:04:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8010 from blackpiglet/7961_fix

Browse Source 
Bump Ginkgo to v2.
This commit is contained in:
lyndon-li
2024-07-17 17:19:08 +08:00
committed by GitHub
parent c69f47d5d2 7a3b947961
commit 55e027897c
38 changed files with 57 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/Makefile
+1 -1
View File
@@ -156,7 +156,7 @@ ginkgo: ${GOBIN}/ginkgo
# This target does not run if ginkgo is already in $GOBIN
${GOBIN}/ginkgo:
GOBIN=${GOBIN} go install github.com/onsi/ginkgo/ginkgo@v1.16.5
GOBIN=${GOBIN} go install github.com/onsi/ginkgo/v2/ginkgo@v2.19.0
.PHONY: run-e2e
run-e2e: ginkgo
test/e2e/backup/backup.go
+1 -1
View File
@@ -22,7 +22,7 @@ import (
"time"
"github.com/google/uuid"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
. "github.com/vmware-tanzu/velero/test"
test/e2e/backups/deletion.go
+1 -1
View File
@@ -23,7 +23,7 @@ import (
"time"
"github.com/google/uuid"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/pkg/errors"
test/e2e/backups/sync_backups.go
+1 -1
View File
@@ -27,7 +27,7 @@ import (
"time"
"github.com/google/uuid"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
. "github.com/vmware-tanzu/velero/test"
test/e2e/backups/ttl.go
+1 -1
View File
@@ -27,7 +27,7 @@ import (
"time"
"github.com/google/uuid"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
. "github.com/vmware-tanzu/velero/test"
test/e2e/basic/api-group/enable_api_group_extentions.go
+1 -1
View File
@@ -21,7 +21,7 @@ import (
"fmt"
"time"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
. "github.com/vmware-tanzu/velero/test"
test/e2e/basic/api-group/enable_api_group_versions.go
+1 -1
View File
@@ -28,7 +28,7 @@ import (
"time"
"github.com/google/uuid"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/pkg/errors"
corev1api "k8s.io/api/core/v1"
test/e2e/basic/backup-volume-info/base.go
+1 -1
View File
@@ -22,7 +22,7 @@ import (
"strings"
"time"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/pkg/errors"
v1 "k8s.io/api/core/v1"
test/e2e/basic/namespace-mapping.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"fmt"
"strings"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
. "github.com/vmware-tanzu/velero/test/e2e/test"
test/e2e/basic/nodeport.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"fmt"
"strings"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/util/intstr"
test/e2e/basic/pvc-selected-node-changing.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"context"
"fmt"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
test/e2e/basic/storage-class-changing.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"context"
"fmt"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
test/e2e/bsl-mgmt/deletion.go
+1 -1
View File
@@ -24,7 +24,7 @@ import (
"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
"github.com/google/uuid"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
. "github.com/vmware-tanzu/velero/test"
test/e2e/e2e_suite_test.go
+4 -4
View File
@@ -25,8 +25,8 @@ import (
"testing"
"time"
. "github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/reporters"
. "github.com/onsi/ginkgo/v2"
"github.com/onsi/ginkgo/v2/reporters"
. "github.com/onsi/gomega"
"github.com/vmware-tanzu/velero/pkg/cmd/cli/install"
@@ -177,8 +177,8 @@ var _ = Describe("[NamespaceMapping][Multiple][Restic] Backup resources should f
var _ = Describe("[NamespaceMapping][Single][Snapshot][SkipVanillaZfs] Backup resources should follow the specific order in schedule", OneNamespaceMappingSnapshotTest)
var _ = Describe("[NamespaceMapping][Multiple][Snapshot]SkipVanillaZfs] Backup resources should follow the specific order in schedule", MultiNamespacesMappingSnapshotTest)
var _ = Describe("[pv-backup][Opt-In] Backup resources should follow the specific order in schedule", OptInPVBackupTest)
var _ = Describe("[pv-backup][Opt-Out] Backup resources should follow the specific order in schedule", OptOutPVBackupTest)
var _ = Describe("Backup resources should follow the specific order in schedule", Label("pv-backup", "Opt-In"), OptInPVBackupTest)
var _ = Describe("Backup resources should follow the specific order in schedule", Label("pv-backup", "Opt-Out"), OptOutPVBackupTest)
var _ = Describe("[Basic][Nodeport] Service nodeport reservation during restore is configurable", NodePortTest)
var _ = Describe("[Basic][StorageClass] Storage class of persistent volumes and persistent volume claims can be changed during restores", StorageClasssChangingTest)
test/e2e/migration/migration.go
+1 -1
View File
@@ -23,7 +23,7 @@ import (
"time"
"github.com/google/uuid"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
. "github.com/vmware-tanzu/velero/test"
test/e2e/parallelfilesdownload/parallel_files_download.go
+1 -1
View File
@@ -19,7 +19,7 @@ package parallelfilesdownload
import (
"fmt"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/pkg/errors"
test/e2e/parallelfilesupload/parallel_files_upload.go
+1 -1
View File
@@ -19,7 +19,7 @@ package parallelfilesupload
import (
"fmt"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/pkg/errors"
test/e2e/privilegesmgmt/ssr.go
+1 -1
View File
@@ -22,7 +22,7 @@ import (
"fmt"
"time"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/util/wait"
test/e2e/pv-backup/pv-backup-filter.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"fmt"
"strings"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/pkg/errors"
test/e2e/resource-filtering/exclude_label.go
+1 -1
View File
@@ -19,7 +19,7 @@ package filtering
import (
"fmt"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/pkg/errors"
apierrors "k8s.io/apimachinery/pkg/api/errors"
test/e2e/resourcemodifiers/resource_modifiers.go
+1 -1
View File
@@ -20,7 +20,7 @@ import (
"fmt"
"strings"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/pkg/errors"
test/e2e/resourcepolicies/resource_policies.go
+1 -1
View File
@@ -20,7 +20,7 @@ import (
"fmt"
"strings"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/pkg/errors"
v1 "k8s.io/api/core/v1"
test/e2e/schedule/ordered_resources.go
+1 -1
View File
@@ -22,7 +22,7 @@ import (
"strings"
"time"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/pkg/errors"
waitutil "k8s.io/apimachinery/pkg/util/wait"
test/e2e/schedule/schedule-backup-creation.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"strings"
"time"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
. "github.com/vmware-tanzu/velero/test/e2e/test"
test/e2e/schedule/schedule.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"strings"
"time"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
. "github.com/vmware-tanzu/velero/test/e2e/test"
test/e2e/test/test.go
+1 -1
View File
@@ -23,7 +23,7 @@ import (
"strings"
"time"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/pkg/errors"
test/e2e/upgrade/upgrade.go
+1 -1
View File
@@ -23,7 +23,7 @@ import (
"time"
"github.com/google/uuid"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
. "github.com/vmware-tanzu/velero/test"
test/perf/e2e_suite_test.go
+3 -3
View File
@@ -23,8 +23,8 @@ import (
"testing"
"time"
. "github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/reporters"
. "github.com/onsi/ginkgo/v2"
"github.com/onsi/ginkgo/v2/reporters"
. "github.com/onsi/gomega"
"github.com/pkg/errors"
@@ -87,7 +87,7 @@ func initConfig() error {
}
VeleroCfg.DefaultClient = &cli
ReportData = &Report{
ReportData = &E2EReport{
TestDescription: VeleroCfg.TestCaseDescribe,
OtherFields: make(map[string]interface{}),
}
test/perf/test/test.go
+1 -1
View File
@@ -22,7 +22,7 @@ import (
"math/rand"
"time"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/pkg/errors"
test/types.go
+2 -2
View File
@@ -49,12 +49,12 @@ var UUIDgen uuid.UUID
var VeleroCfg VeleroConfig
type Report struct {
type E2EReport struct {
TestDescription string `yaml:"Test Description"`
OtherFields map[string]interface{} `yaml:",inline"`
}
var ReportData *Report
var ReportData *E2EReport
type VeleroConfig struct {
VeleroCfgInPerf