mirror of
https://github.com/containers/podman.git
synced 2025-06-20 17:13:43 +08:00
Bump github.com/onsi/gomega from 1.9.0 to 1.10.0
Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.9.0 to 1.10.0. - [Release notes](https://github.com/onsi/gomega/releases) - [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md) - [Commits](https://github.com/onsi/gomega/compare/v1.9.0...v1.10.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
![27856297+dependabot-preview[bot]@users.noreply.github.com](/assets/img/avatar_default.png)
committed by
Daniel J Walsh

parent
ab518cdba0
commit
6b425c46c3
2
go.mod
2
go.mod
@ -35,7 +35,7 @@ require (
|
|||||||
github.com/json-iterator/go v1.1.9
|
github.com/json-iterator/go v1.1.9
|
||||||
github.com/mrunalp/fileutils v0.0.0-20171103030105-7d4729fb3618
|
github.com/mrunalp/fileutils v0.0.0-20171103030105-7d4729fb3618
|
||||||
github.com/onsi/ginkgo v1.12.0
|
github.com/onsi/ginkgo v1.12.0
|
||||||
github.com/onsi/gomega v1.9.0
|
github.com/onsi/gomega v1.10.0
|
||||||
github.com/opencontainers/go-digest v1.0.0-rc1
|
github.com/opencontainers/go-digest v1.0.0-rc1
|
||||||
github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6
|
github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6
|
||||||
github.com/opencontainers/runc v1.0.0-rc9
|
github.com/opencontainers/runc v1.0.0-rc9
|
||||||
|
2
go.sum
2
go.sum
@ -326,6 +326,8 @@ github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa
|
|||||||
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
|
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
|
||||||
github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg=
|
github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg=
|
||||||
github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
|
github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
|
||||||
|
github.com/onsi/gomega v1.10.0 h1:Gwkk+PTu/nfOwNMtUB/mRUv0X7ewW5dO4AERT1ThVKo=
|
||||||
|
github.com/onsi/gomega v1.10.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
|
||||||
github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/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 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ=
|
github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ=
|
||||||
github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
|
github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
|
||||||
|
2
vendor/github.com/onsi/gomega/.travis.yml
generated
vendored
2
vendor/github.com/onsi/gomega/.travis.yml
generated
vendored
@ -1,8 +1,8 @@
|
|||||||
language: go
|
language: go
|
||||||
|
|
||||||
go:
|
go:
|
||||||
- 1.12.x
|
|
||||||
- 1.13.x
|
- 1.13.x
|
||||||
|
- 1.14.x
|
||||||
- gotip
|
- gotip
|
||||||
|
|
||||||
env:
|
env:
|
||||||
|
8
vendor/github.com/onsi/gomega/CHANGELOG.md
generated
vendored
8
vendor/github.com/onsi/gomega/CHANGELOG.md
generated
vendored
@ -1,3 +1,11 @@
|
|||||||
|
## 1.10.0
|
||||||
|
|
||||||
|
### Features
|
||||||
|
- Add HaveHTTPStatusMatcher (#378) [f335c94]
|
||||||
|
- Changed matcher for content-type in VerifyJSONRepresenting (#377) [6024f5b]
|
||||||
|
- Make ghttp usable with x-unit style tests (#376) [c0be499]
|
||||||
|
- Implement PanicWith matcher (#381) [f8032b4]
|
||||||
|
|
||||||
## 1.9.0
|
## 1.9.0
|
||||||
|
|
||||||
### Features
|
### Features
|
||||||
|
33
vendor/github.com/onsi/gomega/gomega_dsl.go
generated
vendored
33
vendor/github.com/onsi/gomega/gomega_dsl.go
generated
vendored
@ -24,7 +24,7 @@ import (
|
|||||||
"github.com/onsi/gomega/types"
|
"github.com/onsi/gomega/types"
|
||||||
)
|
)
|
||||||
|
|
||||||
const GOMEGA_VERSION = "1.9.0"
|
const GOMEGA_VERSION = "1.10.0"
|
||||||
|
|
||||||
const nilFailHandlerPanic = `You are trying to make an assertion, but Gomega's fail handler is nil.
|
const nilFailHandlerPanic = `You are trying to make an assertion, but Gomega's fail handler is nil.
|
||||||
If you're using Ginkgo then you probably forgot to put your assertion in an It().
|
If you're using Ginkgo then you probably forgot to put your assertion in an It().
|
||||||
@ -252,7 +252,7 @@ func Consistently(actual interface{}, intervals ...interface{}) AsyncAssertion {
|
|||||||
return ConsistentlyWithOffset(0, actual, intervals...)
|
return ConsistentlyWithOffset(0, actual, intervals...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// ConsistentlyWithOffset operates like Consistnetly but takes an additional
|
// ConsistentlyWithOffset operates like Consistently but takes an additional
|
||||||
// initial argument to indicate an offset in the call stack. This is useful when building helper
|
// initial argument to indicate an offset in the call stack. This is useful when building helper
|
||||||
// functions that contain matchers. To learn more, read about `ExpectWithOffset`.
|
// functions that contain matchers. To learn more, read about `ExpectWithOffset`.
|
||||||
func ConsistentlyWithOffset(offset int, actual interface{}, intervals ...interface{}) AsyncAssertion {
|
func ConsistentlyWithOffset(offset int, actual interface{}, intervals ...interface{}) AsyncAssertion {
|
||||||
@ -432,3 +432,32 @@ func toDuration(input interface{}) time.Duration {
|
|||||||
|
|
||||||
panic(fmt.Sprintf("%v is not a valid interval. Must be time.Duration, parsable duration string or a number.", input))
|
panic(fmt.Sprintf("%v is not a valid interval. Must be time.Duration, parsable duration string or a number.", input))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Gomega describes the essential Gomega DSL. This interface allows libraries
|
||||||
|
// to abstract between the standard package-level function implementations
|
||||||
|
// and alternatives like *WithT.
|
||||||
|
type Gomega interface {
|
||||||
|
Expect(actual interface{}, extra ...interface{}) Assertion
|
||||||
|
Eventually(actual interface{}, intervals ...interface{}) AsyncAssertion
|
||||||
|
Consistently(actual interface{}, intervals ...interface{}) AsyncAssertion
|
||||||
|
}
|
||||||
|
|
||||||
|
type globalFailHandlerGomega struct{}
|
||||||
|
|
||||||
|
// DefaultGomega supplies the standard package-level implementation
|
||||||
|
var Default Gomega = globalFailHandlerGomega{}
|
||||||
|
|
||||||
|
// Expect is used to make assertions. See documentation for Expect.
|
||||||
|
func (globalFailHandlerGomega) Expect(actual interface{}, extra ...interface{}) Assertion {
|
||||||
|
return Expect(actual, extra...)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Eventually is used to make asynchronous assertions. See documentation for Eventually.
|
||||||
|
func (globalFailHandlerGomega) Eventually(actual interface{}, extra ...interface{}) AsyncAssertion {
|
||||||
|
return Eventually(actual, extra...)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Consistently is used to make asynchronous assertions. See documentation for Consistently.
|
||||||
|
func (globalFailHandlerGomega) Consistently(actual interface{}, extra ...interface{}) AsyncAssertion {
|
||||||
|
return Consistently(actual, extra...)
|
||||||
|
}
|
||||||
|
19
vendor/github.com/onsi/gomega/matchers.go
generated
vendored
19
vendor/github.com/onsi/gomega/matchers.go
generated
vendored
@ -390,6 +390,16 @@ func Panic() types.GomegaMatcher {
|
|||||||
return &matchers.PanicMatcher{}
|
return &matchers.PanicMatcher{}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//PanicWith succeeds if actual is a function that, when invoked, panics with a specific value.
|
||||||
|
//Actual must be a function that takes no arguments and returns no results.
|
||||||
|
//
|
||||||
|
//By default PanicWith uses Equal() to perform the match, however a
|
||||||
|
//matcher can be passed in instead:
|
||||||
|
// Expect(fn).Should(PanicWith(MatchRegexp(`.+Foo$`)))
|
||||||
|
func PanicWith(expected interface{}) types.GomegaMatcher {
|
||||||
|
return &matchers.PanicMatcher{Expected: expected}
|
||||||
|
}
|
||||||
|
|
||||||
//BeAnExistingFile succeeds if a file exists.
|
//BeAnExistingFile succeeds if a file exists.
|
||||||
//Actual must be a string representing the abs path to the file being checked.
|
//Actual must be a string representing the abs path to the file being checked.
|
||||||
func BeAnExistingFile() types.GomegaMatcher {
|
func BeAnExistingFile() types.GomegaMatcher {
|
||||||
@ -408,6 +418,15 @@ func BeADirectory() types.GomegaMatcher {
|
|||||||
return &matchers.BeADirectoryMatcher{}
|
return &matchers.BeADirectoryMatcher{}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//HaveHTTPStatus succeeds if the Status or StatusCode field of an HTTP response matches.
|
||||||
|
//Actual must be either a *http.Response or *httptest.ResponseRecorder.
|
||||||
|
//Expected must be either an int or a string.
|
||||||
|
// Expect(resp).Should(HaveHTTPStatus(http.StatusOK)) // asserts that resp.StatusCode == 200
|
||||||
|
// Expect(resp).Should(HaveHTTPStatus("404 Not Found")) // asserts that resp.Status == "404 Not Found"
|
||||||
|
func HaveHTTPStatus(expected interface{}) types.GomegaMatcher {
|
||||||
|
return &matchers.HaveHTTPStatusMatcher{Expected: expected}
|
||||||
|
}
|
||||||
|
|
||||||
//And succeeds only if all of the given matchers succeed.
|
//And succeeds only if all of the given matchers succeed.
|
||||||
//The matchers are tried in order, and will fail-fast if one doesn't succeed.
|
//The matchers are tried in order, and will fail-fast if one doesn't succeed.
|
||||||
// Expect("hi").To(And(HaveLen(2), Equal("hi"))
|
// Expect("hi").To(And(HaveLen(2), Equal("hi"))
|
||||||
|
42
vendor/github.com/onsi/gomega/matchers/have_http_status_matcher.go
generated
vendored
Normal file
42
vendor/github.com/onsi/gomega/matchers/have_http_status_matcher.go
generated
vendored
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
package matchers
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
|
||||||
|
"github.com/onsi/gomega/format"
|
||||||
|
)
|
||||||
|
|
||||||
|
type HaveHTTPStatusMatcher struct {
|
||||||
|
Expected interface{}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (matcher *HaveHTTPStatusMatcher) Match(actual interface{}) (success bool, err error) {
|
||||||
|
var resp *http.Response
|
||||||
|
switch a := actual.(type) {
|
||||||
|
case *http.Response:
|
||||||
|
resp = a
|
||||||
|
case *httptest.ResponseRecorder:
|
||||||
|
resp = a.Result()
|
||||||
|
default:
|
||||||
|
return false, fmt.Errorf("HaveHTTPStatus matcher expects *http.Response or *httptest.ResponseRecorder. Got:\n%s", format.Object(actual, 1))
|
||||||
|
}
|
||||||
|
|
||||||
|
switch e := matcher.Expected.(type) {
|
||||||
|
case int:
|
||||||
|
return resp.StatusCode == e, nil
|
||||||
|
case string:
|
||||||
|
return resp.Status == e, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return false, fmt.Errorf("HaveHTTPStatus matcher must be passed an int or a string. Got:\n%s", format.Object(matcher.Expected, 1))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (matcher *HaveHTTPStatusMatcher) FailureMessage(actual interface{}) (message string) {
|
||||||
|
return format.Message(actual, "to have HTTP status", matcher.Expected)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (matcher *HaveHTTPStatusMatcher) NegatedFailureMessage(actual interface{}) (message string) {
|
||||||
|
return format.Message(actual, "not to have HTTP status", matcher.Expected)
|
||||||
|
}
|
76
vendor/github.com/onsi/gomega/matchers/panic_matcher.go
generated
vendored
76
vendor/github.com/onsi/gomega/matchers/panic_matcher.go
generated
vendored
@ -8,7 +8,8 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type PanicMatcher struct {
|
type PanicMatcher struct {
|
||||||
object interface{}
|
Expected interface{}
|
||||||
|
object interface{}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (matcher *PanicMatcher) Match(actual interface{}) (success bool, err error) {
|
func (matcher *PanicMatcher) Match(actual interface{}) (success bool, err error) {
|
||||||
@ -28,7 +29,21 @@ func (matcher *PanicMatcher) Match(actual interface{}) (success bool, err error)
|
|||||||
defer func() {
|
defer func() {
|
||||||
if e := recover(); e != nil {
|
if e := recover(); e != nil {
|
||||||
matcher.object = e
|
matcher.object = e
|
||||||
success = true
|
|
||||||
|
if matcher.Expected == nil {
|
||||||
|
success = true
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
valueMatcher, valueIsMatcher := matcher.Expected.(omegaMatcher)
|
||||||
|
if !valueIsMatcher {
|
||||||
|
valueMatcher = &EqualMatcher{Expected: matcher.Expected}
|
||||||
|
}
|
||||||
|
|
||||||
|
success, err = valueMatcher.Match(e)
|
||||||
|
if err != nil {
|
||||||
|
err = fmt.Errorf("PanicMatcher's value matcher failed with:\n%s%s", format.Indent, err.Error())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
@ -38,9 +53,62 @@ func (matcher *PanicMatcher) Match(actual interface{}) (success bool, err error)
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (matcher *PanicMatcher) FailureMessage(actual interface{}) (message string) {
|
func (matcher *PanicMatcher) FailureMessage(actual interface{}) (message string) {
|
||||||
return format.Message(actual, "to panic")
|
if matcher.Expected == nil {
|
||||||
|
// We wanted any panic to occur, but none did.
|
||||||
|
return format.Message(actual, "to panic")
|
||||||
|
}
|
||||||
|
|
||||||
|
if matcher.object == nil {
|
||||||
|
// We wanted a panic with a specific value to occur, but none did.
|
||||||
|
switch matcher.Expected.(type) {
|
||||||
|
case omegaMatcher:
|
||||||
|
return format.Message(actual, "to panic with a value matching", matcher.Expected)
|
||||||
|
default:
|
||||||
|
return format.Message(actual, "to panic with", matcher.Expected)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// We got a panic, but the value isn't what we expected.
|
||||||
|
switch matcher.Expected.(type) {
|
||||||
|
case omegaMatcher:
|
||||||
|
return format.Message(
|
||||||
|
actual,
|
||||||
|
fmt.Sprintf(
|
||||||
|
"to panic with a value matching\n%s\nbut panicked with\n%s",
|
||||||
|
format.Object(matcher.Expected, 1),
|
||||||
|
format.Object(matcher.object, 1),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
default:
|
||||||
|
return format.Message(
|
||||||
|
actual,
|
||||||
|
fmt.Sprintf(
|
||||||
|
"to panic with\n%s\nbut panicked with\n%s",
|
||||||
|
format.Object(matcher.Expected, 1),
|
||||||
|
format.Object(matcher.object, 1),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (matcher *PanicMatcher) NegatedFailureMessage(actual interface{}) (message string) {
|
func (matcher *PanicMatcher) NegatedFailureMessage(actual interface{}) (message string) {
|
||||||
return format.Message(actual, fmt.Sprintf("not to panic, but panicked with\n%s", format.Object(matcher.object, 1)))
|
if matcher.Expected == nil {
|
||||||
|
// We didn't want any panic to occur, but one did.
|
||||||
|
return format.Message(actual, fmt.Sprintf("not to panic, but panicked with\n%s", format.Object(matcher.object, 1)))
|
||||||
|
}
|
||||||
|
|
||||||
|
// We wanted a to ensure a panic with a specific value did not occur, but it did.
|
||||||
|
switch matcher.Expected.(type) {
|
||||||
|
case omegaMatcher:
|
||||||
|
return format.Message(
|
||||||
|
actual,
|
||||||
|
fmt.Sprintf(
|
||||||
|
"not to panic with a value matching\n%s\nbut panicked with\n%s",
|
||||||
|
format.Object(matcher.Expected, 1),
|
||||||
|
format.Object(matcher.object, 1),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
default:
|
||||||
|
return format.Message(actual, "not to panic with", matcher.Expected)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
2
vendor/modules.txt
vendored
2
vendor/modules.txt
vendored
@ -375,7 +375,7 @@ github.com/onsi/ginkgo/reporters/stenographer
|
|||||||
github.com/onsi/ginkgo/reporters/stenographer/support/go-colorable
|
github.com/onsi/ginkgo/reporters/stenographer/support/go-colorable
|
||||||
github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty
|
github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty
|
||||||
github.com/onsi/ginkgo/types
|
github.com/onsi/ginkgo/types
|
||||||
# github.com/onsi/gomega v1.9.0
|
# github.com/onsi/gomega v1.10.0
|
||||||
github.com/onsi/gomega
|
github.com/onsi/gomega
|
||||||
github.com/onsi/gomega/format
|
github.com/onsi/gomega/format
|
||||||
github.com/onsi/gomega/gbytes
|
github.com/onsi/gomega/gbytes
|
||||||
|
Reference in New Issue
Block a user