Merge pull request #33320 from sbko/33138-generic-api-error-messages

Stop referring CLI flags in error messages if API client is unknown
Upstream-commit: a2f3f6660d08dfb667f091e0fd8454c815dd1c81
Component: engine
This commit is contained in:
Vincent Demeester
2017-05-25 10:48:29 -07:00
committed by GitHub
8 changed files with 21 additions and 21 deletions
@@ -44,7 +44,7 @@ func (s *DockerSuite) TestNetHostname(c *check.C) {
c.Assert(out, checker.Contains, runconfig.ErrConflictNetworkHostname.Error())
out, _ = dockerCmdWithFail(c, "run", "--net=container", "busybox", "ps")
c.Assert(out, checker.Contains, "--net: invalid net mode: invalid container format container:<name|id>")
c.Assert(out, checker.Contains, "Invalid network mode: invalid container format container:<name|id>")
out, _ = dockerCmdWithFail(c, "run", "--net=weird", "busybox", "ps")
c.Assert(out, checker.Contains, "network weird not found")