mirror of
https://github.com/octoleo/syncthing.git
synced 2024-10-03 12:09:02 +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.
106 lines
2.8 KiB
Go
106 lines
2.8 KiB
Go
package gbytes
|
|
|
|
import (
|
|
"fmt"
|
|
"regexp"
|
|
|
|
"github.com/onsi/gomega/format"
|
|
)
|
|
|
|
//Objects satisfying the BufferProvider can be used with the Say matcher.
|
|
type BufferProvider interface {
|
|
Buffer() *Buffer
|
|
}
|
|
|
|
/*
|
|
Say is a Gomega matcher that operates on gbytes.Buffers:
|
|
|
|
Ω(buffer).Should(Say("something"))
|
|
|
|
will succeed if the unread portion of the buffer matches the regular expression "something".
|
|
|
|
When Say succeeds, it fast forwards the gbytes.Buffer's read cursor to just after the succesful match.
|
|
Thus, subsequent calls to Say will only match against the unread portion of the buffer
|
|
|
|
Say pairs very well with Eventually. To asser that a buffer eventually receives data matching "[123]-star" within 3 seconds you can:
|
|
|
|
Eventually(buffer, 3).Should(Say("[123]-star"))
|
|
|
|
Ditto with consistently. To assert that a buffer does not receive data matching "never-see-this" for 1 second you can:
|
|
|
|
Consistently(buffer, 1).ShouldNot(Say("never-see-this"))
|
|
|
|
In addition to bytes.Buffers, Say can operate on objects that implement the gbytes.BufferProvider interface.
|
|
In such cases, Say simply operates on the *gbytes.Buffer returned by Buffer()
|
|
|
|
If the buffer is closed, the Say matcher will tell Eventually to abort.
|
|
*/
|
|
func Say(expected string, args ...interface{}) *sayMatcher {
|
|
formattedRegexp := expected
|
|
if len(args) > 0 {
|
|
formattedRegexp = fmt.Sprintf(expected, args...)
|
|
}
|
|
return &sayMatcher{
|
|
re: regexp.MustCompile(formattedRegexp),
|
|
}
|
|
}
|
|
|
|
type sayMatcher struct {
|
|
re *regexp.Regexp
|
|
receivedSayings []byte
|
|
}
|
|
|
|
func (m *sayMatcher) buffer(actual interface{}) (*Buffer, bool) {
|
|
var buffer *Buffer
|
|
|
|
switch x := actual.(type) {
|
|
case *Buffer:
|
|
buffer = x
|
|
case BufferProvider:
|
|
buffer = x.Buffer()
|
|
default:
|
|
return nil, false
|
|
}
|
|
|
|
return buffer, true
|
|
}
|
|
|
|
func (m *sayMatcher) Match(actual interface{}) (success bool, err error) {
|
|
buffer, ok := m.buffer(actual)
|
|
if !ok {
|
|
return false, fmt.Errorf("Say must be passed a *gbytes.Buffer or BufferProvider. Got:\n%s", format.Object(actual, 1))
|
|
}
|
|
|
|
didSay, sayings := buffer.didSay(m.re)
|
|
m.receivedSayings = sayings
|
|
|
|
return didSay, nil
|
|
}
|
|
|
|
func (m *sayMatcher) FailureMessage(actual interface{}) (message string) {
|
|
return fmt.Sprintf(
|
|
"Got stuck at:\n%s\nWaiting for:\n%s",
|
|
format.IndentString(string(m.receivedSayings), 1),
|
|
format.IndentString(m.re.String(), 1),
|
|
)
|
|
}
|
|
|
|
func (m *sayMatcher) NegatedFailureMessage(actual interface{}) (message string) {
|
|
return fmt.Sprintf(
|
|
"Saw:\n%s\nWhich matches the unexpected:\n%s",
|
|
format.IndentString(string(m.receivedSayings), 1),
|
|
format.IndentString(m.re.String(), 1),
|
|
)
|
|
}
|
|
|
|
func (m *sayMatcher) MatchMayChangeInTheFuture(actual interface{}) bool {
|
|
switch x := actual.(type) {
|
|
case *Buffer:
|
|
return !x.Closed()
|
|
case BufferProvider:
|
|
return !x.Buffer().Closed()
|
|
default:
|
|
return true
|
|
}
|
|
}
|