From b9b4f888703a20ddd7670c1b978dcb1621fa210f Mon Sep 17 00:00:00 2001 From: Anda Xu Date: Fri, 18 May 2018 13:01:44 -0700 Subject: [PATCH] more fixes on integration Signed-off-by: Anda Xu --- integration-cli/docker_cli_inspect_test.go | 7 ------- integration/plugin/logging/logging_test.go | 2 ++ internal/test/environment/environment.go | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/integration-cli/docker_cli_inspect_test.go b/integration-cli/docker_cli_inspect_test.go index 247721e616..a1130aebf5 100644 --- a/integration-cli/docker_cli_inspect_test.go +++ b/integration-cli/docker_cli_inspect_test.go @@ -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") -} diff --git a/integration/plugin/logging/logging_test.go b/integration/plugin/logging/logging_test.go index ad2336fc64..1b6f2962bb 100644 --- a/integration/plugin/logging/logging_test.go +++ b/integration/plugin/logging/logging_test.go @@ -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) diff --git a/internal/test/environment/environment.go b/internal/test/environment/environment.go index 9aaabad7be..74c8e2ce0a 100644 --- a/internal/test/environment/environment.go +++ b/internal/test/environment/environment.go @@ -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 {