Browse code

remove --detach on scale

Signed-off-by: Victor Vieux <victorvieux@gmail.com>

Victor Vieux authored on 2017/09/28 09:47:51
Showing 2 changed files
... ...
@@ -27,10 +27,10 @@ func (s *DockerSwarmSuite) TestServiceScale(c *check.C) {
27 27
 	out, err = d.Cmd(service2Args...)
28 28
 	c.Assert(err, checker.IsNil)
29 29
 
30
-	out, err = d.Cmd("service", "scale", "--detach", "TestService1=2")
30
+	out, err = d.Cmd("service", "scale", "TestService1=2")
31 31
 	c.Assert(err, checker.IsNil)
32 32
 
33
-	out, err = d.Cmd("service", "scale", "--detach", "TestService1=foobar")
33
+	out, err = d.Cmd("service", "scale", "TestService1=foobar")
34 34
 	c.Assert(err, checker.NotNil)
35 35
 
36 36
 	str := fmt.Sprintf("%s: invalid replicas value %s", service1Name, "foobar")
... ...
@@ -38,7 +38,7 @@ func (s *DockerSwarmSuite) TestServiceScale(c *check.C) {
38 38
 		c.Errorf("got: %s, expected has sub string: %s", out, str)
39 39
 	}
40 40
 
41
-	out, err = d.Cmd("service", "scale", "--detach", "TestService1=-1")
41
+	out, err = d.Cmd("service", "scale", "TestService1=-1")
42 42
 	c.Assert(err, checker.NotNil)
43 43
 
44 44
 	str = fmt.Sprintf("%s: invalid replicas value %s", service1Name, "-1")
... ...
@@ -47,7 +47,7 @@ func (s *DockerSwarmSuite) TestServiceScale(c *check.C) {
47 47
 	}
48 48
 
49 49
 	// TestService2 is a global mode
50
-	out, err = d.Cmd("service", "scale", "--detach", "TestService2=2")
50
+	out, err = d.Cmd("service", "scale", "TestService2=2")
51 51
 	c.Assert(err, checker.NotNil)
52 52
 
53 53
 	str = fmt.Sprintf("%s: scale can only be used with replicated mode\n", service2Name)
... ...
@@ -2033,7 +2033,7 @@ func (s *DockerSwarmSuite) TestSwarmClusterEventsService(c *check.C) {
2033 2033
 
2034 2034
 	// scale service
2035 2035
 	t2 := daemonUnixTime(c)
2036
-	out, err = d.Cmd("service", "scale", "--detach", "test=3")
2036
+	out, err = d.Cmd("service", "scale", "test=3")
2037 2037
 	c.Assert(err, checker.IsNil, check.Commentf(out))
2038 2038
 
2039 2039
 	out = waitForEvent(c, d, t2, "-f scope=swarm", "service update "+serviceID, defaultRetryCount)