mirror of
https://github.com/octoleo/syncthing.git
synced 2024-11-20 03:51:00 +00:00
65aaa607ab
Change made by: - running "gvt fetch" on each of the packages mentioned in Godeps/Godeps.json - `rm -rf Godeps` - tweaking the build scripts to not mention Godeps - tweaking the build scripts to test `./lib/...`, `./cmd/...` explicitly (to avoid testing vendor) - tweaking the build scripts to not juggle GOPATH for Godeps and instead set GO15VENDOREXPERIMENT. This also results in some updated packages at the same time I bet. Building with Go 1.3 and 1.4 still *works* but won't use our vendored dependencies - the user needs to have the actual packages in their GOPATH then, which they'll get with a normal "go get". Building with Go 1.6+ will get our vendored dependencies by default even when not using our build script, which is nice. By doing this we gain some freedom in that we can pick and choose manually what to include in vendor, as it's not based on just dependency analysis of our own code. This is also a risk as we might pick up dependencies we are unaware of, as the build may work locally with those packages present in GOPATH. On the other hand the build server will detect this as it has no packages in it's GOPATH beyond what is included in the repo. Recommended tool to manage dependencies is github.com/FiloSottile/gvt.
68 lines
1.9 KiB
Go
68 lines
1.9 KiB
Go
package matchers
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/onsi/gomega/format"
|
|
"github.com/onsi/gomega/internal/oraclematcher"
|
|
"github.com/onsi/gomega/types"
|
|
)
|
|
|
|
type OrMatcher struct {
|
|
Matchers []types.GomegaMatcher
|
|
|
|
// state
|
|
firstSuccessfulMatcher types.GomegaMatcher
|
|
}
|
|
|
|
func (m *OrMatcher) Match(actual interface{}) (success bool, err error) {
|
|
m.firstSuccessfulMatcher = nil
|
|
for _, matcher := range m.Matchers {
|
|
success, err := matcher.Match(actual)
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
if success {
|
|
m.firstSuccessfulMatcher = matcher
|
|
return true, nil
|
|
}
|
|
}
|
|
return false, nil
|
|
}
|
|
|
|
func (m *OrMatcher) FailureMessage(actual interface{}) (message string) {
|
|
// not the most beautiful list of matchers, but not bad either...
|
|
return format.Message(actual, fmt.Sprintf("To satisfy at least one of these matchers: %s", m.Matchers))
|
|
}
|
|
|
|
func (m *OrMatcher) NegatedFailureMessage(actual interface{}) (message string) {
|
|
return m.firstSuccessfulMatcher.NegatedFailureMessage(actual)
|
|
}
|
|
|
|
func (m *OrMatcher) MatchMayChangeInTheFuture(actual interface{}) bool {
|
|
/*
|
|
Example with 3 matchers: A, B, C
|
|
|
|
Match evaluates them: F, T, <?> => T
|
|
So match is currently T, what should MatchMayChangeInTheFuture() return?
|
|
Seems like it only depends on B, since currently B MUST change to allow the result to become F
|
|
|
|
Match eval: F, F, F => F
|
|
So match is currently F, what should MatchMayChangeInTheFuture() return?
|
|
Seems to depend on ANY of them being able to change to T.
|
|
*/
|
|
|
|
if m.firstSuccessfulMatcher != nil {
|
|
// one of the matchers succeeded.. it must be able to change in order to affect the result
|
|
return oraclematcher.MatchMayChangeInTheFuture(m.firstSuccessfulMatcher, actual)
|
|
} else {
|
|
// so all matchers failed.. Any one of them changing would change the result.
|
|
for _, matcher := range m.Matchers {
|
|
if oraclematcher.MatchMayChangeInTheFuture(matcher, actual) {
|
|
return true
|
|
}
|
|
}
|
|
return false // none of were going to change
|
|
}
|
|
}
|