mirror of
https://github.com/octoleo/syncthing.git
synced 2024-11-10 15:20:56 +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.
89 lines
2.0 KiB
Go
89 lines
2.0 KiB
Go
package gexec
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/onsi/gomega/format"
|
|
)
|
|
|
|
/*
|
|
The Exit matcher operates on a session:
|
|
|
|
Ω(session).Should(Exit(<optional status code>))
|
|
|
|
Exit passes if the session has already exited.
|
|
|
|
If no status code is provided, then Exit will succeed if the session has exited regardless of exit code.
|
|
Otherwise, Exit will only succeed if the process has exited with the provided status code.
|
|
|
|
Note that the process must have already exited. To wait for a process to exit, use Eventually:
|
|
|
|
Eventually(session, 3).Should(Exit(0))
|
|
*/
|
|
func Exit(optionalExitCode ...int) *exitMatcher {
|
|
exitCode := -1
|
|
if len(optionalExitCode) > 0 {
|
|
exitCode = optionalExitCode[0]
|
|
}
|
|
|
|
return &exitMatcher{
|
|
exitCode: exitCode,
|
|
}
|
|
}
|
|
|
|
type exitMatcher struct {
|
|
exitCode int
|
|
didExit bool
|
|
actualExitCode int
|
|
}
|
|
|
|
type Exiter interface {
|
|
ExitCode() int
|
|
}
|
|
|
|
func (m *exitMatcher) Match(actual interface{}) (success bool, err error) {
|
|
exiter, ok := actual.(Exiter)
|
|
if !ok {
|
|
return false, fmt.Errorf("Exit must be passed a gexec.Exiter (Missing method ExitCode() int) Got:\n%s", format.Object(actual, 1))
|
|
}
|
|
|
|
m.actualExitCode = exiter.ExitCode()
|
|
|
|
if m.actualExitCode == -1 {
|
|
return false, nil
|
|
}
|
|
|
|
if m.exitCode == -1 {
|
|
return true, nil
|
|
}
|
|
return m.exitCode == m.actualExitCode, nil
|
|
}
|
|
|
|
func (m *exitMatcher) FailureMessage(actual interface{}) (message string) {
|
|
if m.actualExitCode == -1 {
|
|
return "Expected process to exit. It did not."
|
|
} else {
|
|
return format.Message(m.actualExitCode, "to match exit code:", m.exitCode)
|
|
}
|
|
}
|
|
|
|
func (m *exitMatcher) NegatedFailureMessage(actual interface{}) (message string) {
|
|
if m.actualExitCode == -1 {
|
|
return "you really shouldn't be able to see this!"
|
|
} else {
|
|
if m.exitCode == -1 {
|
|
return "Expected process not to exit. It did."
|
|
} else {
|
|
return format.Message(m.actualExitCode, "not to match exit code:", m.exitCode)
|
|
}
|
|
}
|
|
}
|
|
|
|
func (m *exitMatcher) MatchMayChangeInTheFuture(actual interface{}) bool {
|
|
session, ok := actual.(*Session)
|
|
if ok {
|
|
return session.ExitCode() == -1
|
|
}
|
|
return true
|
|
}
|