diff options
| author | Tibor Vass <tibor@docker.com> | 2019-09-09 21:05:56 +0000 |
|---|---|---|
| committer | Tibor Vass <tibor@docker.com> | 2019-09-09 21:05:56 +0000 |
| commit | 74747b35e196d05d1389f5855dd41521f9fd9543 (patch) | |
| tree | 573ccf340a419f5c7e1b75870829f20197a28520 /integration-cli/docker_cli_inspect_test.go | |
| parent | 230f7bcc02569dfa916401ac6259643be8bb84f7 (diff) | |
| download | docker-74747b35e196d05d1389f5855dd41521f9fd9543.tar.gz | |
rm-gocheck: Not(IsNil) -> != nil
sed -E -i 's#\bassert\.Assert\(c, (.*), checker\.Not\(checker\.IsNil\)#assert.Assert(c, \1 != nil#g' \
-- "integration-cli/docker_api_containers_test.go" "integration-cli/docker_cli_inspect_test.go" "integration-cli/docker_cli_service_create_test.go" "integration-cli/docker_cli_volume_test.go"
Signed-off-by: Tibor Vass <tibor@docker.com>
Diffstat (limited to 'integration-cli/docker_cli_inspect_test.go')
| -rw-r--r-- | integration-cli/docker_cli_inspect_test.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/integration-cli/docker_cli_inspect_test.go b/integration-cli/docker_cli_inspect_test.go index b9189c572b..5fd6999953 100644 --- a/integration-cli/docker_cli_inspect_test.go +++ b/integration-cli/docker_cli_inspect_test.go @@ -324,11 +324,11 @@ func (s *DockerSuite) TestInspectTemplateError(c *testing.T) { runSleepingContainer(c, "--name=container1", "-d") out, _, err := dockerCmdWithError("inspect", "--type=container", "--format='Format container: {{.ThisDoesNotExist}}'", "container1") - assert.Assert(c, err, checker.Not(checker.IsNil)) + assert.Assert(c, err != nil) assert.Assert(c, out, checker.Contains, "Template parsing error") out, _, err = dockerCmdWithError("inspect", "--type=image", "--format='Format container: {{.ThisDoesNotExist}}'", "busybox") - assert.Assert(c, err, checker.Not(checker.IsNil)) + assert.Assert(c, err != nil) assert.Assert(c, out, checker.Contains, "Template parsing error") } @@ -356,7 +356,7 @@ func (s *DockerSuite) TestInspectStopWhenNotFound(c *testing.T) { runSleepingContainer(c, "--name=busybox2", "-d") result := dockerCmdWithResult("inspect", "--type=container", "--format='{{.Name}}'", "busybox1", "busybox2", "missing") - assert.Assert(c, result.Error, checker.Not(checker.IsNil)) + assert.Assert(c, result.Error != nil) assert.Assert(c, result.Stdout(), checker.Contains, "busybox1") assert.Assert(c, result.Stdout(), checker.Contains, "busybox2") assert.Assert(c, result.Stderr(), checker.Contains, "Error: No such container: missing") @@ -364,7 +364,7 @@ func (s *DockerSuite) TestInspectStopWhenNotFound(c *testing.T) { // test inspect would not fast fail result = dockerCmdWithResult("inspect", "--type=container", "--format='{{.Name}}'", "missing", "busybox1", "busybox2") - assert.Assert(c, result.Error, checker.Not(checker.IsNil)) + assert.Assert(c, result.Error != nil) assert.Assert(c, result.Stdout(), checker.Contains, "busybox1") assert.Assert(c, result.Stdout(), checker.Contains, "busybox2") assert.Assert(c, result.Stderr(), checker.Contains, "Error: No such container: missing") |