mobi/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2025-08-01 05:47:11 +03:00
Code Activity

Merge pull request #30548 from yongtang/vendor-swarmkit

Browse Source 
Update SwarmKit to 78ae345f449ac69aa741c762df7e5f0020f70275
This commit is contained in:
Alexander Morozov
2017-01-30 09:41:08 -08:00
committed by GitHub
parent 9931cb045d 2cc2d059de
commit 61198b5ea3
17 changed files with 351 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
integration-cli/docker_cli_swarm_test.go
View File

@ -671,17 +671,8 @@ func (s *DockerSwarmSuite) TestSwarmNetworkPlugin(c *check.C) {
d := s.AddDaemon(c, true, true)
out, err := d.Cmd("network", "create", "-d", globalNetworkPlugin, "foo")
c.Assert(err, checker.IsNil)
c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
name := "top"
out, err = d.Cmd("service", "create", "--name", name, "--network", "foo", "busybox", "top")
c.Assert(err, checker.IsNil)
c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
out, err = d.Cmd("service", "inspect", "--format", "{{range .Spec.Networks}}{{.Target}}{{end}}", name)
c.Assert(err, checker.IsNil)
c.Assert(strings.TrimSpace(out), checker.Equals, "foo")
c.Assert(err, checker.NotNil)
c.Assert(out, checker.Contains, "not supported in swarm mode")
}
// Test case for #24712