From 0ad0294124badebe0d9a73f1b7e2f030e4a24e2b Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Wed, 27 Sep 2017 17:47:51 -0700 Subject: [PATCH] remove --detach on scale Signed-off-by: Victor Vieux --- integration-cli/docker_cli_service_scale_test.go | 8 ++++---- integration-cli/docker_cli_swarm_test.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/integration-cli/docker_cli_service_scale_test.go b/integration-cli/docker_cli_service_scale_test.go index 3d718d1cc2..41b49d64aa 100644 --- a/integration-cli/docker_cli_service_scale_test.go +++ b/integration-cli/docker_cli_service_scale_test.go @@ -27,10 +27,10 @@ func (s *DockerSwarmSuite) TestServiceScale(c *check.C) { out, err = d.Cmd(service2Args...) c.Assert(err, checker.IsNil) - out, err = d.Cmd("service", "scale", "--detach", "TestService1=2") + out, err = d.Cmd("service", "scale", "TestService1=2") c.Assert(err, checker.IsNil) - out, err = d.Cmd("service", "scale", "--detach", "TestService1=foobar") + out, err = d.Cmd("service", "scale", "TestService1=foobar") c.Assert(err, checker.NotNil) str := fmt.Sprintf("%s: invalid replicas value %s", service1Name, "foobar") @@ -38,7 +38,7 @@ func (s *DockerSwarmSuite) TestServiceScale(c *check.C) { c.Errorf("got: %s, expected has sub string: %s", out, str) } - out, err = d.Cmd("service", "scale", "--detach", "TestService1=-1") + out, err = d.Cmd("service", "scale", "TestService1=-1") c.Assert(err, checker.NotNil) str = fmt.Sprintf("%s: invalid replicas value %s", service1Name, "-1") @@ -47,7 +47,7 @@ func (s *DockerSwarmSuite) TestServiceScale(c *check.C) { } // TestService2 is a global mode - out, err = d.Cmd("service", "scale", "--detach", "TestService2=2") + out, err = d.Cmd("service", "scale", "TestService2=2") c.Assert(err, checker.NotNil) str = fmt.Sprintf("%s: scale can only be used with replicated mode\n", service2Name) diff --git a/integration-cli/docker_cli_swarm_test.go b/integration-cli/docker_cli_swarm_test.go index 68addbb215..d1709ab811 100644 --- a/integration-cli/docker_cli_swarm_test.go +++ b/integration-cli/docker_cli_swarm_test.go @@ -2033,7 +2033,7 @@ func (s *DockerSwarmSuite) TestSwarmClusterEventsService(c *check.C) { // scale service t2 := daemonUnixTime(c) - out, err = d.Cmd("service", "scale", "--detach", "test=3") + out, err = d.Cmd("service", "scale", "test=3") c.Assert(err, checker.IsNil, check.Commentf(out)) out = waitForEvent(c, d, t2, "-f scope=swarm", "service update "+serviceID, defaultRetryCount)