Merge pull request #23283 from yongtang/23211-spf13-cobra-diff

Use spf13/cobra for docker diff
Upstream-commit: 2becfab55fd8ad6ec1d02aea3cd6498a2f91ef68
Component: engine
This commit is contained in:
Vincent Demeester
2016-06-06 09:05:18 +02:00
6 changed files with 60 additions and 52 deletions
@@ -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.Equals, "Container name cannot be empty")
c.Assert(strings.TrimSpace(out), checker.Contains, "\"docker diff\" requires exactly 1 argument(s).")
}