mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
more fixes on integration
Signed-off-by: Anda Xu <anda.xu@docker.com>
This commit is contained in:
parent
da99009bbb
commit
b9b4f88870
3 changed files with 3 additions and 8 deletions
|
@ -458,10 +458,3 @@ func (s *DockerSuite) TestInspectUnknownObject(c *check.C) {
|
|||
c.Assert(out, checker.Contains, "Error: No such object: foobar")
|
||||
c.Assert(err.Error(), checker.Contains, "Error: No such object: foobar")
|
||||
}
|
||||
|
||||
func (s *DockerSuite) TestInspectInvalidReference(c *check.C) {
|
||||
// This test should work on both Windows and Linux
|
||||
out, _, err := dockerCmdWithError("inspect", "FooBar")
|
||||
c.Assert(err, checker.NotNil)
|
||||
c.Assert(out, checker.Contains, "invalid reference format: repository name must be lowercase")
|
||||
}
|
||||
|
|
|
@ -12,9 +12,11 @@ import (
|
|||
"github.com/docker/docker/integration/internal/container"
|
||||
"github.com/docker/docker/internal/test/daemon"
|
||||
"github.com/gotestyourself/gotestyourself/assert"
|
||||
"github.com/gotestyourself/gotestyourself/skip"
|
||||
)
|
||||
|
||||
func TestContinueAfterPluginCrash(t *testing.T) {
|
||||
skip.If(t, testEnv.IsRemoteDaemon(), "test requires daemon on the same host")
|
||||
t.Parallel()
|
||||
|
||||
d := daemon.New(t)
|
||||
|
|
|
@ -121,7 +121,7 @@ func (e *Execution) IsRemoteDaemon() bool {
|
|||
return !e.IsLocalDaemon()
|
||||
}
|
||||
|
||||
// DaemonAPIVersion returns the negociated daemon api version
|
||||
// DaemonAPIVersion returns the negotiated daemon api version
|
||||
func (e *Execution) DaemonAPIVersion() string {
|
||||
version, err := e.APIClient().ServerVersion(context.TODO())
|
||||
if err != nil {
|
||||
|
|
Loading…
Reference in a new issue