mobi/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2025-12-24 13:21:20 +03:00
Code Activity

Merge pull request #18531 from coolljt0725/update_container_networking_on_create

Browse Source 
fix docker inspect return unconsistent network settings  of created container and stopped container
This commit is contained in:
Alexander Morozov
2015-12-15 08:47:54 -08:00
parent 06ce22c6e6 c427131c94
commit 812a7c204a
4 changed files with 55 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
integration-cli/docker_cli_network_unix_test.go
View File

@@ -897,3 +897,22 @@ func (s *DockerNetworkSuite) TestDockerNetworkConnectWithMac(c *check.C) {
c.Assert(err, checker.IsNil)
c.Assert(strings.TrimSpace(mac2), checker.Not(checker.Equals), strings.TrimSpace(mac1))
}
func (s *DockerNetworkSuite) TestDockerNetworkInspectCreatedContainer(c *check.C) {
dockerCmd(c, "create", "--name", "test", "busybox")
networks, err := inspectField("test", "NetworkSettings.Networks")
c.Assert(err, checker.IsNil)
c.Assert(networks, checker.Contains, "bridge", check.Commentf("Should return 'bridge' network"))
}
func (s *DockerNetworkSuite) TestDockerNetworkRestartWithMulipleNetworks(c *check.C) {
dockerCmd(c, "network", "create", "test")
dockerCmd(c, "run", "--name=foo", "-d", "busybox", "top")
c.Assert(waitRun("foo"), checker.IsNil)
dockerCmd(c, "network", "connect", "test", "foo")
dockerCmd(c, "restart", "foo")
networks, err := inspectField("foo", "NetworkSettings.Networks")
c.Assert(err, checker.IsNil)
c.Assert(networks, checker.Contains, "bridge", check.Commentf("Should contain 'bridge' network"))
c.Assert(networks, checker.Contains, "test", check.Commentf("Should contain 'test' netwokr"))
}