mobi/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2025-10-25 20:38:05 +03:00
Code Activity

Merge pull request #19527 from aboch/epc

Browse Source 
Move Unsupp Network & IP check to the new updateNetworkConfig() func
This commit is contained in:
David Calavera
2016-01-22 15:54:21 -08:00
parent 504a8ad295 3b0d36dbc1
commit 422827fa92
3 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
integration-cli/docker_cli_network_unix_test.go
View File

@@ -1147,7 +1147,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkConnectPreferredIP(c *check.C) {
func (s *DockerNetworkSuite) TestDockerNetworkUnsupportedPreferredIP(c *check.C) {
// preferred IP is not supported on predefined networks
for _, mode := range []string{"none", "host", "bridge"} {
for _, mode := range []string{"none", "host", "bridge", "default"} {
checkUnsupportedNetworkAndIP(c, mode)
}
@@ -1300,6 +1300,16 @@ func (s *DockerSuite) TestUserDefinedNetworkConnectDisconnectAlias(c *check.C) {
// ping to net2 scoped alias "bar" must still succeed
_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", "bar")
c.Assert(err, check.IsNil)
// verify the alias option is rejected when running on predefined network
out, _, err := dockerCmdWithError("run", "--rm", "--name=any", "--net-alias=any", "busybox", "top")
c.Assert(err, checker.NotNil, check.Commentf("out: %s", out))
c.Assert(out, checker.Contains, runconfig.ErrUnsupportedNetworkAndAlias.Error())
// verify the alias option is rejected when connecting to predefined network
out, _, err = dockerCmdWithError("network", "connect", "--alias=any", "bridge", "first")
c.Assert(err, checker.NotNil, check.Commentf("out: %s", out))
c.Assert(out, checker.Contains, runconfig.ErrUnsupportedNetworkAndAlias.Error())
}
func (s *DockerSuite) TestUserDefinedNetworkConnectivity(c *check.C) {