toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove CLI specific information for API error messages. Issue #17147

Browse Source 
Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
Upstream-commit: 74900edbf867e6ffe4e824a8c6383eb34a658341
Component: engine
This commit is contained in:
Karol Duleba
2015-12-01 22:01:51 +00:00
committed by Karol Duleba
parent 0a4f515b90
commit c9f2f55bc6
3 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/engine/integration-cli/docker_cli_links_test.go
View File

@ -6,6 +6,7 @@ import (
"strings"
"github.com/docker/docker/pkg/integration/checker"
"github.com/docker/docker/runconfig"
"github.com/go-check/check"
)
@ -202,7 +203,7 @@ func (s *DockerSuite) TestLinksNetworkHostContainer(c *check.C) {
// Running container linking to a container with --net host should have failed
c.Assert(err, checker.NotNil, check.Commentf("out: %s", out))
// Running container linking to a container with --net host should have failed
c.Assert(out, checker.Contains, "--net=host can't be used with links. This would result in undefined behavior")
c.Assert(out, checker.Contains, runconfig.ErrConflictHostNetworkAndLinks.Error())
}
func (s *DockerSuite) TestLinksEtcHostsRegularFile(c *check.C) {