Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump ginkgo version to v2.3.0 #2532

Merged
merged 4 commits into from
Oct 13, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
31 changes: 0 additions & 31 deletions LICENSES/vendor/golang.org/x/xerrors/LICENSE

This file was deleted.

23 changes: 11 additions & 12 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@ require (
github.com/agiledragon/gomonkey/v2 v2.1.0
github.com/fsnotify/fsnotify v1.5.1
github.com/golang/mock v1.6.0
github.com/google/go-cmp v0.5.5
github.com/google/go-cmp v0.5.8
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
github.com/hashicorp/go-multierror v1.0.0
github.com/imdario/mergo v0.3.5
github.com/mitchellh/mapstructure v1.5.0
github.com/onsi/ginkgo/v2 v2.0.0
github.com/onsi/gomega v1.17.0
github.com/onsi/ginkgo/v2 v2.3.0
github.com/onsi/gomega v1.21.1
github.com/prometheus/client_golang v1.12.0
github.com/prometheus/common v0.32.1
github.com/spf13/cobra v1.2.1
github.com/spf13/pflag v1.0.5
go.uber.org/automaxprocs v1.4.0
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.23.0
Expand Down Expand Up @@ -81,20 +81,19 @@ require (
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.19.0 // indirect
golang.org/x/mod v0.4.2 // indirect
golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/tools v0.1.6-0.20210820212750-d4cc65f0b2ff // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
golang.org/x/tools v0.1.12 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2 // indirect
google.golang.org/grpc v1.40.0 // indirect
google.golang.org/protobuf v1.27.1 // indirect
google.golang.org/protobuf v1.28.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/cloud-provider v0.23.0 // indirect
k8s.io/component-helpers v0.23.0 // indirect
k8s.io/csi-translation-lib v0.23.0 // indirect
Expand Down
45 changes: 23 additions & 22 deletions go.sum

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion test/e2e/schedulingaction/reclaim.go
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,6 @@ var _ = Describe("Reclaim E2E Test", func() {
Expect(err).NotTo(HaveOccurred(), "Error waiting for queue running")

for _, pod := range job3pods.Items {
fmt.Println(pod.Name)
err = ctx.Kubeclient.CoreV1().Pods(pod.Namespace).Delete(context.TODO(), pod.Name, metav1.DeleteOptions{})
Expect(err).NotTo(HaveOccurred(), "Failed to delete pod %s", pod.Name)
}
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/util/job.go
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ func WaitJobPhases(ctx *TestContext, job *batchv1alpha1.Job, phases []batchv1alp

ch := w.ResultChan()
index := 0
timeout := time.After(FiveMinute)
timeout := time.After(TenMinute)

for index < len(phases) {
select {
Expand Down Expand Up @@ -461,7 +461,7 @@ func WaitJobPhases(ctx *TestContext, job *batchv1alpha1.Job, phases []batchv1alp
}

index++
timeout = time.After(FiveMinute)
timeout = time.After(TenMinute)

case <-timeout:
return fmt.Errorf("[Wait time out]: %s", additionalError)
Expand Down
5 changes: 3 additions & 2 deletions test/e2e/util/queue.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@ package util

import (
"context"
v1 "k8s.io/api/core/v1"
"time"

v1 "k8s.io/api/core/v1"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down Expand Up @@ -119,7 +120,7 @@ func SetQueueReclaimable(ctx *TestContext, queues []string, reclaimable bool) {
}

func WaitQueueStatus(condition func() (bool, error)) error {
return wait.Poll(100*time.Millisecond, FiveMinute, condition)
return wait.Poll(100*time.Millisecond, TenMinute, condition)
}

// queueClosed returns whether the Queue is closed
Expand Down
1 change: 1 addition & 0 deletions test/e2e/util/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ var (
OneMinute = 1 * time.Minute
TwoMinute = 2 * time.Minute
FiveMinute = 5 * time.Minute
TenMinute = 10 * time.Minute
OneCPU = v1.ResourceList{"cpu": resource.MustParse("1000m")}
TwoCPU = v1.ResourceList{"cpu": resource.MustParse("2000m")}
ThreeCPU = v1.ResourceList{"cpu": resource.MustParse("3000m")}
Expand Down
9 changes: 8 additions & 1 deletion vendor/github.com/google/go-cmp/cmp/cmpopts/equate.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 0 additions & 15 deletions vendor/github.com/google/go-cmp/cmp/cmpopts/errors_go113.go

This file was deleted.

18 changes: 0 additions & 18 deletions vendor/github.com/google/go-cmp/cmp/cmpopts/errors_xerrors.go

This file was deleted.

19 changes: 2 additions & 17 deletions vendor/github.com/google/go-cmp/cmp/compare.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions vendor/github.com/google/go-cmp/cmp/export_panic.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions vendor/github.com/google/go-cmp/cmp/export_unsafe.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/github.com/google/go-cmp/cmp/path.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion vendor/github.com/google/go-cmp/cmp/report_compare.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading