From 7878705dcc26804b5f6a562410aecdb8f3485b91 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Mon, 6 Jun 2016 13:58:29 +0200 Subject: [PATCH] Fix TestDiffEmptyArgClientError O:) Signed-off-by: Vincent Demeester --- api/client/container/diff.go | 3 +++ integration-cli/docker_cli_diff_test.go | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/api/client/container/diff.go b/api/client/container/diff.go index 053b9e1647..2eb860b390 100644 --- a/api/client/container/diff.go +++ b/api/client/container/diff.go @@ -34,6 +34,9 @@ func NewDiffCommand(dockerCli *client.DockerCli) *cobra.Command { } func runDiff(dockerCli *client.DockerCli, opts *diffOptions) error { + if opts.container == "" { + return fmt.Errorf("Container name cannot be empty") + } ctx := context.Background() changes, err := dockerCli.Client().ContainerDiff(ctx, opts.container) diff --git a/integration-cli/docker_cli_diff_test.go b/integration-cli/docker_cli_diff_test.go index e046740783..957617c97d 100644 --- a/integration-cli/docker_cli_diff_test.go +++ b/integration-cli/docker_cli_diff_test.go @@ -83,5 +83,5 @@ func (s *DockerSuite) TestDiffEnsureDefaultDevs(c *check.C) { func (s *DockerSuite) TestDiffEmptyArgClientError(c *check.C) { out, _, err := dockerCmdWithError("diff", "") c.Assert(err, checker.NotNil) - c.Assert(strings.TrimSpace(out), checker.Contains, "\"docker diff\" requires exactly 1 argument(s).") + c.Assert(strings.TrimSpace(out), checker.Contains, "Container name cannot be empty") }