Browse code

Update TestSwarmNetworkPlugin test

This commit updates TestSwarmNetworkPlugin, similiar to
changes in https://github.com/docker/docker/pull/30332

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>

Yong Tang authored on 2017/01/30 03:57:58
Showing 1 changed files
... ...
@@ -670,17 +670,8 @@ func (s *DockerSwarmSuite) TestSwarmNetworkPlugin(c *check.C) {
670 670
 	d := s.AddDaemon(c, true, true)
671 671
 
672 672
 	out, err := d.Cmd("network", "create", "-d", globalNetworkPlugin, "foo")
673
-	c.Assert(err, checker.IsNil)
674
-	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
675
-
676
-	name := "top"
677
-	out, err = d.Cmd("service", "create", "--name", name, "--network", "foo", "busybox", "top")
678
-	c.Assert(err, checker.IsNil)
679
-	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
680
-
681
-	out, err = d.Cmd("service", "inspect", "--format", "{{range .Spec.Networks}}{{.Target}}{{end}}", name)
682
-	c.Assert(err, checker.IsNil)
683
-	c.Assert(strings.TrimSpace(out), checker.Equals, "foo")
673
+	c.Assert(err, checker.NotNil)
674
+	c.Assert(out, checker.Contains, "not supported in swarm mode")
684 675
 }
685 676
 
686 677
 // Test case for #24712