diff options
| author | Sebastiaan van Stijn <github@gone.nl> | 2019-04-04 15:23:19 +0200 |
|---|---|---|
| committer | Sebastiaan van Stijn <github@gone.nl> | 2019-04-05 16:45:37 +0200 |
| commit | 6345208b9b067f19f7792edcc675f59a617a3ca5 (patch) | |
| tree | 6bc6b87e4d3a70732400d1a38914a554e3f785ae /integration-cli/docker_cli_service_scale_test.go | |
| parent | 86f2ac4a6b5b746c3309b57e7e04bdbdb70d46d7 (diff) | |
| download | docker-6345208b9b067f19f7792edcc675f59a617a3ca5.tar.gz | |
Replace some checkers and assertions with gotest.tools
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Diffstat (limited to 'integration-cli/docker_cli_service_scale_test.go')
| -rw-r--r-- | integration-cli/docker_cli_service_scale_test.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/integration-cli/docker_cli_service_scale_test.go b/integration-cli/docker_cli_service_scale_test.go index ad045ee570..f02bc738aa 100644 --- a/integration-cli/docker_cli_service_scale_test.go +++ b/integration-cli/docker_cli_service_scale_test.go @@ -6,8 +6,8 @@ import ( "fmt" "strings" - "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" + "gotest.tools/assert" ) func (s *DockerSwarmSuite) TestServiceScale(c *check.C) { @@ -22,16 +22,16 @@ func (s *DockerSwarmSuite) TestServiceScale(c *check.C) { // Create services _, err := d.Cmd(service1Args...) - c.Assert(err, checker.IsNil) + assert.NilError(c, err) _, err = d.Cmd(service2Args...) - c.Assert(err, checker.IsNil) + assert.NilError(c, err) _, err = d.Cmd("service", "scale", "TestService1=2") - c.Assert(err, checker.IsNil) + assert.NilError(c, err) out, err := d.Cmd("service", "scale", "TestService1=foobar") - c.Assert(err, checker.NotNil) + assert.ErrorContains(c, err, "") str := fmt.Sprintf("%s: invalid replicas value %s", service1Name, "foobar") if !strings.Contains(out, str) { @@ -39,7 +39,7 @@ func (s *DockerSwarmSuite) TestServiceScale(c *check.C) { } out, err = d.Cmd("service", "scale", "TestService1=-1") - c.Assert(err, checker.NotNil) + assert.ErrorContains(c, err, "") str = fmt.Sprintf("%s: invalid replicas value %s", service1Name, "-1") if !strings.Contains(out, str) { @@ -48,7 +48,7 @@ func (s *DockerSwarmSuite) TestServiceScale(c *check.C) { // TestService2 is a global mode out, err = d.Cmd("service", "scale", "TestService2=2") - c.Assert(err, checker.NotNil) + assert.ErrorContains(c, err, "") str = fmt.Sprintf("%s: scale can only be used with replicated mode\n", service2Name) if out != str { |