mirror of
https://github.com/containers/podman.git
synced 2025-06-02 02:26:52 +08:00
Merge pull request #21290 from containers/renovate/github.com-onsi-gomega-1.x
Update module github.com/onsi/gomega to v1.31.0
This commit is contained in:
2
go.mod
2
go.mod
@ -46,7 +46,7 @@ require (
|
||||
github.com/moby/term v0.5.0
|
||||
github.com/nxadm/tail v1.4.11
|
||||
github.com/onsi/ginkgo/v2 v2.14.0
|
||||
github.com/onsi/gomega v1.30.0
|
||||
github.com/onsi/gomega v1.31.0
|
||||
github.com/opencontainers/go-digest v1.0.0
|
||||
github.com/opencontainers/image-spec v1.1.0-rc5
|
||||
github.com/opencontainers/runc v1.1.10
|
||||
|
4
go.sum
4
go.sum
@ -845,8 +845,8 @@ github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoT
|
||||
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
|
||||
github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc=
|
||||
github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
|
||||
github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=
|
||||
github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
|
||||
github.com/onsi/gomega v1.31.0 h1:54UJxxj6cPInHS3a35wm6BK/F9nHYueZ1NVujHDrnXE=
|
||||
github.com/onsi/gomega v1.31.0/go.mod h1:DW9aCi7U6Yi40wNVAvT6kzFnEVEI5n3DloYBiKiT6zk=
|
||||
github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
|
||||
github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
|
||||
github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
|
||||
|
14
vendor/github.com/onsi/gomega/CHANGELOG.md
generated
vendored
14
vendor/github.com/onsi/gomega/CHANGELOG.md
generated
vendored
@ -1,3 +1,17 @@
|
||||
## 1.31.0
|
||||
|
||||
### Features
|
||||
- Async assertions include context cancellation cause if present [121c37f]
|
||||
|
||||
### Maintenance
|
||||
- Bump minimum go version [dee1e3c]
|
||||
- docs: fix typo in example usage "occured" -> "occurred" [49005fe]
|
||||
- Bump actions/setup-go from 4 to 5 (#714) [f1c8757]
|
||||
- Bump github/codeql-action from 2 to 3 (#715) [9836e76]
|
||||
- Bump github.com/onsi/ginkgo/v2 from 2.13.0 to 2.13.2 (#713) [54726f0]
|
||||
- Bump golang.org/x/net from 0.17.0 to 0.19.0 (#711) [df97ecc]
|
||||
- docs: fix `HaveExactElement` typo (#712) [a672c86]
|
||||
|
||||
## 1.30.0
|
||||
|
||||
### Features
|
||||
|
2
vendor/github.com/onsi/gomega/gomega_dsl.go
generated
vendored
2
vendor/github.com/onsi/gomega/gomega_dsl.go
generated
vendored
@ -22,7 +22,7 @@ import (
|
||||
"github.com/onsi/gomega/types"
|
||||
)
|
||||
|
||||
const GOMEGA_VERSION = "1.30.0"
|
||||
const GOMEGA_VERSION = "1.31.0"
|
||||
|
||||
const nilGomegaPanic = `You are trying to make an assertion, but haven't registered Gomega's fail handler.
|
||||
If you're using Ginkgo then you probably forgot to put your assertion in an It().
|
||||
|
7
vendor/github.com/onsi/gomega/internal/async_assertion.go
generated
vendored
7
vendor/github.com/onsi/gomega/internal/async_assertion.go
generated
vendored
@ -553,7 +553,12 @@ func (assertion *AsyncAssertion) match(matcher types.GomegaMatcher, desiredMatch
|
||||
lock.Unlock()
|
||||
}
|
||||
case <-contextDone:
|
||||
fail("Context was cancelled")
|
||||
err := context.Cause(assertion.ctx)
|
||||
if err != nil && err != context.Canceled {
|
||||
fail(fmt.Sprintf("Context was cancelled (cause: %s)", err))
|
||||
} else {
|
||||
fail("Context was cancelled")
|
||||
}
|
||||
return false
|
||||
case <-timeout:
|
||||
if assertion.asyncType == AsyncAssertionTypeEventually {
|
||||
|
2
vendor/github.com/onsi/gomega/matchers.go
generated
vendored
2
vendor/github.com/onsi/gomega/matchers.go
generated
vendored
@ -394,7 +394,7 @@ func ConsistOf(elements ...interface{}) types.GomegaMatcher {
|
||||
}
|
||||
}
|
||||
|
||||
// HaveExactElemets succeeds if actual contains elements that precisely match the elemets passed into the matcher. The ordering of the elements does matter.
|
||||
// HaveExactElements succeeds if actual contains elements that precisely match the elemets passed into the matcher. The ordering of the elements does matter.
|
||||
// By default HaveExactElements() uses Equal() to match the elements, however custom matchers can be passed in instead. Here are some examples:
|
||||
//
|
||||
// Expect([]string{"Foo", "FooBar"}).Should(HaveExactElements("Foo", "FooBar"))
|
||||
|
4
vendor/modules.txt
vendored
4
vendor/modules.txt
vendored
@ -836,8 +836,8 @@ github.com/onsi/ginkgo/v2/internal/parallel_support
|
||||
github.com/onsi/ginkgo/v2/internal/testingtproxy
|
||||
github.com/onsi/ginkgo/v2/reporters
|
||||
github.com/onsi/ginkgo/v2/types
|
||||
# github.com/onsi/gomega v1.30.0
|
||||
## explicit; go 1.18
|
||||
# github.com/onsi/gomega v1.31.0
|
||||
## explicit; go 1.20
|
||||
github.com/onsi/gomega
|
||||
github.com/onsi/gomega/format
|
||||
github.com/onsi/gomega/gbytes
|
||||
|
Reference in New Issue
Block a user